Skip to content

Commit 5a521a4

Browse files
PeterPetrikPeterPetrik
authored
bump geodiff version (#8)
with geodiff 1.0.6
1 parent e57126c commit 5a521a4

File tree

13 files changed

+305
-64
lines changed

13 files changed

+305
-64
lines changed

‎.github/workflows/code_style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Code Layout
22
on: [push]
33
jobs:
44
code_style:
5-
if: ( github.repository == 'lutraconsulting/mergin-cpp-client' )
5+
if: ( github.repository == 'MerginMaps/mergin-cpp-client' )
66
runs-on: ubuntu-latest
77
steps:
88
- name: Install astyle

‎.github/workflows/linux.yml

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
name: Linux Build
22
on: [push]
33
env:
4-
TEST_MERGIN_URL: https://test.dev.cloudmergin.com/
4+
TEST_MERGIN_URL: https://test.dev.merginmaps.com/
55
TEST_API_USERNAME: test_inputapp
66
TEST_API_PASSWORD: ${{ secrets.MERGINTEST_API_PASSWORD }}
7-
7+
QT_VERSION: '5.14.2'
8+
CACHE_VERSION: 2
9+
GEODIFF_VERSION: 1.0.6
10+
INPUT_VERSION: 'master'
11+
12+
concurrency:
13+
group: ci-${{github.ref}}-linux
14+
cancel-in-progress: true
15+
816
jobs:
917
linux_build:
10-
if: ( github.repository == 'lutraconsulting/mergin-cpp-client' )
18+
if: ( github.repository == 'MerginMaps/mergin-cpp-client' )
1119
runs-on: ubuntu-latest
1220
steps:
1321
- name: Checkout mergin-cpp-client
@@ -18,20 +26,36 @@ jobs:
1826
- name: Checkout input
1927
uses: actions/checkout@v2
2028
with:
21-
repository: lutraconsulting/input
29+
ref: ${{ env.INPUT_VERSION }}
30+
repository: MerginMaps/input
2231
path: input
2332

2433
- name: Checkout geodiff
2534
uses: actions/checkout@v2
2635
with:
27-
ref: 0.8.8
28-
repository: lutraconsulting/geodiff
36+
ref: ${{ env.GEODIFF_VERSION }}
37+
repository: MerginMaps/geodiff
2938
path: geodiff
3039

3140
- name: Install Deps
3241
run: |
33-
sudo apt-get install cmake qt5-default libqt5network5
42+
sudo apt-get install cmake
43+
44+
- name: Cache Qt
45+
id: cache-qt
46+
uses: pat-s/always-upload-cache@v2.1.5
47+
with:
48+
path: ${{ github.workspace }}/Qt
49+
key: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-${{ env.CACHE_VERSION }}
3450

51+
- name: Install Qt
52+
uses: jurplel/install-qt-action@v2
53+
with:
54+
version: ${{ env.QT_VERSION }}
55+
setup-python: 'false'
56+
dir: ${{ github.workspace }}
57+
cached: ${{ steps.cache-qt.outputs.cache-hit }}
58+
3559
- name: build geodiff
3660
run: |
3761
mkdir -p build-geodiff
@@ -40,6 +64,8 @@ jobs:
4064
cmake \
4165
-DCMAKE_BUILD_TYPE=Debug \
4266
-DENABLE_TESTS=FALSE \
67+
-DBUILD_STATIC=ON \
68+
-DBUILD_SHARED=OFF \
4369
../geodiff/geodiff
4470
4571
make
@@ -51,14 +77,14 @@ jobs:
5177
mkdir -p build-mergin-cpp-client
5278
cd build-mergin-cpp-client
5379
54-
qmake \
80+
$Qt5_DIR/bin/qmake \
5581
'QMAKE_CFLAGS_ISYSTEM=-I' \
5682
../mergin-cpp-client/src/client.pro \
5783
CONFIG+=debug
5884
5985
make
60-
61-
- name: run mergin tests
86+
87+
- name: run tests
6288
run: |
63-
cd build-mergin-cpp-client/
64-
LD_LIBRARY_PATH=../build-geodiff:$LD_LIBRARY_PATH ./mergin --help
89+
cd build-mergin-cpp-client/
90+
$(pwd)/../mergin-cpp-client/tests.bash $(pwd)/mergin

‎.github/workflows/macos.yml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
name: macOS Build
2+
on: [push]
3+
env:
4+
QT_VERSION: '5.14.2'
5+
CACHE_VERSION: 2
6+
GEODIFF_VERSION: 1.0.6
7+
INPUT_VERSION: 'master'
8+
TEST_MERGIN_URL: https://test.dev.merginmaps.com/
9+
TEST_API_USERNAME: test_inputapp
10+
TEST_API_PASSWORD: ${{ secrets.MERGINTEST_API_PASSWORD }}
11+
12+
concurrency:
13+
group: ci-${{github.ref}}-macos
14+
cancel-in-progress: true
15+
16+
jobs:
17+
macos_build:
18+
if: ( github.repository == 'MerginMaps/mergin-cpp-client' )
19+
runs-on: macos-latest
20+
steps:
21+
- name: Checkout mergin-cpp-client
22+
uses: actions/checkout@v2
23+
with:
24+
path: mergin-cpp-client
25+
26+
- name: Checkout input
27+
uses: actions/checkout@v2
28+
with:
29+
ref: ${{ env.INPUT_VERSION }}
30+
repository: MerginMaps/input
31+
path: input
32+
33+
- name: Checkout geodiff
34+
uses: actions/checkout@v2
35+
with:
36+
ref: ${{ env.GEODIFF_VERSION }}
37+
repository: MerginMaps/geodiff
38+
path: geodiff
39+
40+
- name: Install Deps
41+
run: |
42+
brew install cmake
43+
brew install sqlite3
44+
45+
- name: Cache Qt
46+
id: cache-qt
47+
uses: pat-s/always-upload-cache@v2.1.5
48+
with:
49+
path: ${{ github.workspace }}/Qt
50+
key: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-${{ env.CACHE_VERSION }}
51+
52+
- name: Install Qt
53+
uses: jurplel/install-qt-action@v2
54+
with:
55+
version: ${{ env.QT_VERSION }}
56+
setup-python: 'false'
57+
dir: ${{ github.workspace }}
58+
cached: ${{ steps.cache-qt.outputs.cache-hit }}
59+
60+
- name: build geodiff
61+
run: |
62+
mkdir -p build-geodiff
63+
cd build-geodiff
64+
65+
cmake \
66+
-DCMAKE_BUILD_TYPE=Debug \
67+
-DENABLE_TESTS=FALSE \
68+
-DBUILD_STATIC=ON \
69+
-DBUILD_SHARED=OFF \
70+
-DSQLite3_INCLUDE_DIR=/usr/local/opt/sqlite3/include \
71+
-DSQLite3_LIBRARY=/usr/local/opt/sqlite3/lib/libsqlite3.dylib \
72+
../geodiff/geodiff
73+
74+
make
75+
76+
- name: build mergin-cpp-client
77+
run: |
78+
cp mergin-cpp-client/scripts/ci/config.pri mergin-cpp-client/src/config.pri
79+
mkdir -p build-mergin-cpp-client
80+
cd build-mergin-cpp-client
81+
82+
$Qt5_DIR/bin/qmake \
83+
../mergin-cpp-client/src/client.pro \
84+
CONFIG+=debug
85+
86+
make
87+
88+
- name: run tests
89+
run: |
90+
cd build-mergin-cpp-client/
91+
$(pwd)/../mergin-cpp-client/tests.bash `pwd`/mergin
92+

‎.github/workflows/windows.yml

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
name: Windows Build
22
on: [push]
33

4+
env:
5+
CCACHE_DIR: ~/.ccache
6+
QT_VERSION: '5.14.2'
7+
CACHE_VERSION: 1
8+
GEODIFF_VERSION: 1.0.6
9+
INPUT_VERSION: 'master'
10+
11+
concurrency:
12+
group: ci-${{github.ref}}-windows
13+
cancel-in-progress: true
14+
415
jobs:
516
windows_build:
6-
if: ( github.repository == 'lutraconsulting/mergin-cpp-client' )
17+
if: ( github.repository == 'MerginMaps/mergin-cpp-client' )
718
runs-on: windows-latest
8-
env:
9-
VS_VERSION: Visual Studio 16
10-
VS_VER: 2019
11-
SDK: release-1911
12-
MSVC_VER: 1920
13-
platform: x86
1419

1520
steps:
21+
- name: install deps
22+
run: |
23+
C:/vcpkg/vcpkg install sqlite3[rtree,fts3,json1] --triplet x64-windows-static
24+
C:/vcpkg/vcpkg integrate install
25+
dir "C:/vcpkg/packages/sqlite3_x64-windows-static/include"
26+
dir "C:/vcpkg/packages/sqlite3_x64-windows-static/lib/"
27+
1628
- name: Checkout mergin-cpp-client
1729
uses: actions/checkout@v2
1830
with:
@@ -21,50 +33,58 @@ jobs:
2133
- name: Checkout input
2234
uses: actions/checkout@v2
2335
with:
24-
repository: lutraconsulting/input
36+
ref: ${{ env.INPUT_VERSION }}
37+
repository: MerginMaps/input
2538
path: input
2639

2740
- name: Checkout geodiff
2841
uses: actions/checkout@v2
2942
with:
30-
ref: 0.8.8
31-
repository: lutraconsulting/geodiff
43+
ref: ${{ env.GEODIFF_VERSION }}
44+
repository: MerginMaps/geodiff
3245
path: geodiff
3346

34-
35-
- name: Cache Qt from qt.io
47+
- name: Cache Qt
3648
id: cache-qt
37-
uses: actions/cache@v1
49+
uses: pat-s/always-upload-cache@v2.1.5
3850
with:
39-
path: ../Qt
40-
key: Windows-QtCache
51+
path: ${{ github.workspace }}/Qt
52+
key: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-${{ env.CACHE_VERSION }}
4153

4254
- name: Install Qt
4355
uses: jurplel/install-qt-action@v2
4456
with:
57+
version: ${{ env.QT_VERSION }}
58+
dir: ${{ github.workspace }}
4559
cached: ${{ steps.cache-qt.outputs.cache-hit }}
4660

4761
- name: Setup cmake
4862
uses: jwlawson/actions-setup-cmake@v1.8
4963

5064
- name: build geodiff
51-
shell: cmd
65+
shell: pwsh
5266
run: |
67+
$ErrorActionPreference = 'continue'
68+
function exec
69+
{
70+
param ( [ScriptBlock] $ScriptBlock )
71+
& $ScriptBlock 2>&1 | ForEach-Object -Process { "$_" }
72+
if ($LastExitCode -ne 0) { exit $LastExitCode }
73+
}
74+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x64
75+
cd $env:GITHUB_WORKSPACE
5376
mkdir build-geodiff
5477
cd build-geodiff
55-
56-
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
57-
cmake -DENABLE_TESTS=FALSE ..\geodiff\geodiff
58-
cmake --build . --config Release
78+
exec { cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DSQLite3_INCLUDE_DIR=C:/vcpkg/packages/sqlite3_x64-windows-static/include -DSQLite3_LIBRARY=C:/vcpkg/packages/sqlite3_x64-windows-static/lib/sqlite3.lib -DENABLE_TESTS=ON -DWITH_POSTGRESQL=FALSE -DBUILD_STATIC=ON -DBUILD_SHARED=OFF ../geodiff/geodiff }
79+
exec { cmake --build . --config Release }
5980
6081
- name: build mergin-cpp-client
6182
shell: cmd
6283
run: |
6384
copy mergin-cpp-client\scripts\ci\config.pri mergin-cpp-client\src\config.pri
6485
mkdir build-mergin-cpp-client
6586
cd build-mergin-cpp-client
66-
67-
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
87+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x64
6888
qmake ..\mergin-cpp-client\src\client.pro CONFIG+=release CONFIG+=static
6989
nmake release
7090
@@ -74,10 +94,9 @@ jobs:
7494
mkdir rel
7595
cd rel
7696
copy ..\build-mergin-cpp-client\release\mergin.exe mergin.exe
77-
copy ..\build-geodiff\Release\geodiff.dll geodiff.dll
7897
copy "C:\Program Files\OpenSSL\bin\libcrypto-1_1-x64.dll" libcrypto-1_1-x64.dll
7998
copy "C:\Program Files\OpenSSL\bin\libssl-1_1-x64.dll" libssl-1_1-x64.dll
80-
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
99+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x64
81100
windeployqt --release mergin.exe
82101
dir
83102

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
src/config.pri
22
src/client.pro.user
33

4+
*build*
5+
.qmake.stash
6+
47
# Prerequisites
58
*.d
69

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 lutraconsulting
3+
Copyright (c) 2021-2022 Lutra Consulting Ltd.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)