Skip to content

Commit

Permalink
Merge branch 'fix_test_workflow' into fix-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Caha committed Dec 8, 2023
2 parents 5169f7f + 4cc4bb8 commit dc21f42
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 9 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/build_windows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build standalone tool for Windows

on: push

jobs:

Compile-on-Windows:

runs-on: windows-latest

steps:

- uses: actions/checkout@v3

- uses: robinraju/[email protected]
with:
repository: "MerginMaps/geodiff"
latest: true
fileName: "geodiff_windows_binaries.zip"
zipBall: false
out-file-path: "scripts/windows_binaries"
extract: true

- name: Delete files from binaries
run: |
cd scripts/windows_binaries
del geodiff_*.zip
- uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Install dependencies
run: |
python -m pip install dynaconf pyinstaller mergin-client psycopg2
- name: Build Binary
run: |
cd scripts
cmd.exe /C build_exe.bat
- name: Copy config file
run: copy config.yaml.default scripts/dist/config.yaml

- name: Upload Zip file as artifact
uses: actions/upload-artifact@v3
with:
name: dbsync_standalone_win
path: scripts/dist
8 changes: 5 additions & 3 deletions .github/workflows/tests_mergin_db_sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@ jobs:
- name: Check Geodiff version
run: geodiff version

- name: Checkout
uses: actions/checkout@v4

- name: Install Python dependencies
run: |
python3 -m pip install --upgrade pip
python3 -m pip install mergin-client pytest pytest-cov dynaconf psycopg2
python3 -m pip install -r requirements.txt
python3 -m pip install -r requirements-dev.txt
- name: Checkout
uses: actions/checkout@v2
- name: Run tests
run: |
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# Mergin Maps Database Sync

<picture>
<source media="(prefers-color-scheme: dark)" width=350 srcset="https://raw.githubusercontent.com/MerginMaps/.github/main/images/MM_logo_HORIZ_COLOR_NEGATIVE_VECTOR.svg">
<img width=350 src="https://raw.githubusercontent.com/MerginMaps/.github/main/images/MM_logo_HORIZ_COLOR_PRIMARY_VECTOR.svg">
</picture>

This tool takes care of two-way synchronization between [Mergin Maps](https://merginmaps.com/) and another database (currently supporting PostGIS).

That means you can:
Expand Down
3 changes: 3 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pytest
pytest-cov
psycopg2
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mergin-client>=0.8.3
mergin-client>=0.9.0
dynaconf>=3.1

0 comments on commit dc21f42

Please sign in to comment.