From 0cb2ed1fdee0aab52693774ac031aef49dece8e4 Mon Sep 17 00:00:00 2001 From: Jan Caha Date: Fri, 20 Jun 2025 11:36:06 +0200 Subject: [PATCH 1/4] update action --- .github/workflows/build_windows.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index e24e93c..8035886 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -12,10 +12,11 @@ jobs: - uses: actions/checkout@v4 - - uses: robinraju/release-downloader@v1.10 + - uses: robinraju/release-downloader@v1 with: repository: "MerginMaps/geodiff" - latest: true + latest: false + tag: '2.0.2' # latest tag with windows binaries fileName: "geodiff_windows_binaries.zip" zipBall: false out-file-path: "scripts/windows_binaries" From 556ada856f3c43a4d2b5a9b83695361c54165caf Mon Sep 17 00:00:00 2001 From: Jan Caha Date: Fri, 2 Oct 2026 11:39:55 +0200 Subject: [PATCH 2/4] dll files are no longer part of the release, they are packed in geodiff.exe --- scripts/build_exe.bat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/build_exe.bat b/scripts/build_exe.bat index 4c0082a..50d5b6e 100755 --- a/scripts/build_exe.bat +++ b/scripts/build_exe.bat @@ -2,11 +2,6 @@ pyinstaller ../dbsync_daemon.py ^ -c ^ --noconfirm ^ --add-binary="./windows_binaries/geodiff.exe;lib" ^ - --add-binary="./windows_binaries/geodiff.dll;lib" ^ - --add-binary="./windows_binaries/libcrypto-3-x64.dll;lib" ^ - --add-binary="./windows_binaries/LIBPQ.dll;lib" ^ - --add-binary="./windows_binaries/libssl-3-x64.dll;lib" ^ - --add-binary="./windows_binaries/sqlite3.dll;lib" ^ --hidden-import dynaconf ^ --collect-all mergin ^ --clean ^ From fbc0f190e125861698d675421628100304396646 Mon Sep 17 00:00:00 2001 From: Jan Caha Date: Fri, 2 Oct 2026 11:40:03 +0200 Subject: [PATCH 3/4] update workflow --- .github/workflows/build_windows.yaml | 30 +++++++++++----------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 8035886..8dc3db6 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -10,26 +10,20 @@ jobs: steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - - uses: robinraju/release-downloader@v1 - with: - repository: "MerginMaps/geodiff" - latest: false - tag: '2.0.2' # latest tag with windows binaries - fileName: "geodiff_windows_binaries.zip" - zipBall: false - out-file-path: "scripts/windows_binaries" - extract: true - - - name: Delete files from binaries + - name: Download geodiff.exe from latest geodiff release + env: + GH_TOKEN: ${{ github.token }} run: | - cd scripts/windows_binaries - del geodiff_*.zip - - - uses: actions/setup-python@v5 + gh release download ` + --repo MerginMaps/geodiff ` + --pattern "geodiff.exe" ` + --dir scripts/windows_binaries + + - uses: actions/setup-python@v7 with: - python-version: '3.10' + python-version: '3.12' - name: Install dependencies run: | @@ -45,7 +39,7 @@ jobs: run: copy config.yaml.default scripts/dist/config.yaml - name: Upload Zip file as artifact - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: dbsync_standalone_win path: scripts/dist \ No newline at end of file From 318a33c0ed0ee04c37ed219e91f8b6882c1dd7a4 Mon Sep 17 00:00:00 2001 From: Jan Caha Date: Fri, 2 Oct 2026 14:24:41 +0200 Subject: [PATCH 4/4] pin geodiff to specific release --- .github/workflows/build_windows.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index 89b8bc2..1f4d75e 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -12,11 +12,11 @@ jobs: - uses: actions/checkout@v7 - - name: Download geodiff.exe from latest geodiff release + - name: Download geodiff.exe from geodiff release env: GH_TOKEN: ${{ github.token }} run: | - gh release download ` + gh release download 2.3.0 ` --repo MerginMaps/geodiff ` --pattern "geodiff.exe" ` --dir scripts/windows_binaries