From 89e7b2c6519cb6998adab20bcb89f2249bad2ed9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Olav?= Date: Sat, 25 Jan 2025 07:46:59 +0100 Subject: [PATCH] clients: always build zip for gui-binaries --- .github/workflows/build.yml | 2 ++ clients/launcher/assets/chain_config.json | 2 +- clients/scripts/build-windows.sh | 16 +++++++--------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 787f5609..d7bf7a51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -212,10 +212,12 @@ jobs: mv bitwindow-binaries-macOS/bitwindow-osx64.zip BitWindow-latest-x86_64-apple-darwin.zip || true mv bitwindow-binaries-Linux/bitwindow-x86_64-linux-gnu.zip BitWindow-latest-x86_64-unknown-linux-gnu.zip || true mv bitwindow-binaries-Windows/bitwindow-win64.msix BitWindow-latest-x86_64-pc-windows-msvc.msix || true + mv bitwindow-binaries-Windows/bitwindow-win64.zip BitWindow-latest-x86_64-pc-windows-msvc.zip || true # Launcher mv launcher-binaries-macOS/launcher-osx64.zip Launcher-latest-x86_64-apple-darwin.zip || true mv launcher-binaries-Linux/launcher-x86_64-linux-gnu.zip Launcher-latest-x86_64-unknown-linux-gnu.zip || true mv launcher-binaries-Windows/launcher-win64.msix Launcher-latest-x86_64-pc-windows-msvc.msix || true + mv launcher-binaries-Windows/launcher-win64.zip Launcher-latest-x86_64-pc-windows-msvc.zip || true - name: Upload artifacts to releases.drivechain.info uses: cross-the-world/ssh-scp-ssh-pipelines@latest diff --git a/clients/launcher/assets/chain_config.json b/clients/launcher/assets/chain_config.json index e382ab34..d1b581ac 100644 --- a/clients/launcher/assets/chain_config.json +++ b/clients/launcher/assets/chain_config.json @@ -77,7 +77,7 @@ "binary": { "linux": "bitwindow", "darwin": "bitwindow.app", - "win32": "bitwindow.msix" + "win32": "bitwindow.exe" }, "network": { "port": 8080 diff --git a/clients/scripts/build-windows.sh b/clients/scripts/build-windows.sh index a52b4d84..75aabb21 100644 --- a/clients/scripts/build-windows.sh +++ b/clients/scripts/build-windows.sh @@ -25,15 +25,13 @@ build_cmd="flutter build windows --dart-define-from-file=build-vars.env" # Create MSIX with specific options for CI msix_cmd="dart run msix:create --build-windows false --install-certificate false" -# Build first -powershell.exe -Command "& {$clean_cmd; $build_cmd; exit}" +# Build and create an MSIX +powershell.exe -Command "& {$clean_cmd; $build_cmd; $msix_cmd; exit}" -# Create MSIX -powershell.exe -Command "& {$msix_cmd; exit}" - -# Create release directory and copy MSIX with fixed name +# Prepare the release directory with correct names +msix_name=$lower_app_name.msix +zip_name=$lower_app_name-win64.zip mkdir -p release -# Copy MSIX to release directory and rename it consistently -msix_name=$lower_app_name-win64.msix -cp build/windows/x64/runner/Release/*.msix "release/$msix_name" +# Then zip everything from Release directory including the renamed MSIX +powershell.exe -Command "Compress-Archive -Force build\windows\x64\runner\Release\* release/$zip_name" \ No newline at end of file