Skip to content
This repository was archived by the owner on Nov 17, 2025. It is now read-only.

Commit f560b6d

Browse files
PeterPetrikPeterPetrik
committed
fix tests
1 parent ca8c1d4 commit f560b6d

File tree

2 files changed

+39
-5
lines changed

2 files changed

+39
-5
lines changed

‎.github/workflows/windows.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
cd build-geodiff
5656
5757
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
58-
cmake -DBUILD_STATIC=TRUE -DENABLE_TESTS=FALSE ..\geodiff\geodiff
58+
cmake -DENABLE_TESTS=FALSE ..\geodiff\geodiff
5959
cmake --build . --config Release
6060
6161
- name: build mergin-cpp-client
@@ -68,9 +68,17 @@ jobs:
6868
call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
6969
qmake ..\mergin-cpp-client\src\client.pro CONFIG+=release CONFIG+=static
7070
nmake release
71-
dir
71+
72+
- name: create release folder
73+
shell: cmd
74+
run: |
75+
mkdir rel
76+
cd rel
77+
copy build-mergin-cpp-client\release\mergin.exe mergin.exe
78+
copy build-geodiff\Release\geodiff.dll geodiff.dll
79+
windeployqt --release --verbose 2 mergin.exe
7280
7381
- name: run mergin tests
7482
run: |
75-
cd build-mergin-cpp-client/release
76-
mergin --help
83+
cd rel
84+
mergin.exe --help

‎README.md‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,33 @@ Commands:
3636

3737
### Compilation
3838

39-
TODO
39+
#### Windows
40+
41+
For CI setup, see this [GitHub Action](.github/workflows/windows.yml)
42+
43+
1. Install Visual Studio (At least c++ compiler)
44+
2. Install Qt5 (some recent version, 5.14.x or 5.15.x)
45+
3. Install Cmake
46+
4. Compile [Geodiff](https://github.com/lutraconsulting/geodiff)
47+
```
48+
<in VS cmd>
49+
git clone https://github.com/lutraconsulting/geodiff
50+
cd build-geodiff
51+
cmake ..\geodiff\geodiff
52+
cmake --build . --config Release
53+
```
54+
5. Download Input
55+
```
56+
git clone https://github.com/lutraconsulting/input
57+
git checkout mergin_cpp
58+
```
59+
6. Compile Client
60+
```
61+
<in VS cmd>
62+
cd build-client
63+
qmake ..\mergin-cpp-client\src\client.pro
64+
nmake release
65+
```
4066

4167
### Tests
4268
TODO

0 commit comments

Comments
 (0)