From e02851819cb843082b32dc6429a4ae532143ac79 Mon Sep 17 00:00:00 2001 From: Martin Dobias Date: Thu, 15 Jan 2026 23:07:27 +0100 Subject: [PATCH 1/2] use new geodiff binaries --- .github/workflows/build_windows.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml index e24e93c..d972b7f 100644 --- a/.github/workflows/build_windows.yaml +++ b/.github/workflows/build_windows.yaml @@ -16,7 +16,7 @@ jobs: with: repository: "MerginMaps/geodiff" latest: true - fileName: "geodiff_windows_binaries.zip" + fileName: "geodiff.exe.zip" zipBall: false out-file-path: "scripts/windows_binaries" extract: true @@ -24,7 +24,7 @@ jobs: - name: Delete files from binaries run: | cd scripts/windows_binaries - del geodiff_*.zip + del geodiff.exe.zip - uses: actions/setup-python@v5 with: @@ -47,4 +47,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: dbsync_standalone_win - path: scripts/dist \ No newline at end of file + path: scripts/dist From 7cfb82c7d560beb410517ae85bc722b967410c94 Mon Sep 17 00:00:00 2001 From: Martin Dobias Date: Thu, 15 Jan 2026 22:10:33 +0000 Subject: [PATCH 2/2] only use geodiff.exe (static build) --- 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 ^