From 5eb6cbc15ff844e3e2f783f8e62e7d0f8977c5cd Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 17 Jun 2024 08:44:13 -0700 Subject: [PATCH] ci: Bump versions and fix publish workflow (again) (#5402) - Bump gui client version - Fix issue discovered during publishing gui client --- .github/workflows/_tauri.yml | 18 +++++++++--------- .github/workflows/ci.yml | 2 +- .github/workflows/publish.yml | 1 + rust/Cargo.lock | 2 +- rust/gui-client/src-tauri/Cargo.toml | 2 +- scripts/Makefile | 4 ++-- website/redirects.js | 6 +++--- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 808f84aea..64c30616b 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -26,22 +26,22 @@ jobs: include: - runs-on: ubuntu-20.04 # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.0.8_x86_64 + binary-dest-path: firezone-client-gui-linux_1.0.9_x86_64 rename-script: ../../scripts/build/tauri-rename-ubuntu.sh upload-script: ../../scripts/build/tauri-upload-ubuntu.sh # mark:next-gui-version - syms-artifact: rust/gui-client/firezone-client-gui-linux_1.0.8_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.0.9_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.8_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.9_x86_64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.0.8_x86_64 + binary-dest-path: firezone-client-gui-windows_1.0.9_x86_64 rename-script: ../../scripts/build/tauri-rename-windows.sh upload-script: ../../scripts/build/tauri-upload-windows.sh # mark:next-gui-version - syms-artifact: rust/gui-client/firezone-client-gui-windows_1.0.8_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.0.9_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.8_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.9_x86_64.msi env: BINARY_DEST_PATH: ${{ matrix.binary-dest-path }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} @@ -50,7 +50,7 @@ jobs: AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_CERT_NAME: ${{ secrets.AZURE_CERT_NAME }} # mark:next-gui-version - FIREZONE_PACKAGE_VERSION: 1.0.8 + FIREZONE_PACKAGE_VERSION: 1.0.9 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-node @@ -80,7 +80,7 @@ jobs: if: ${{ runner.os == 'Windows' }} shell: bash # mark:next-gui-version - run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.0.8_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.0.9_x64_en-US.msi - name: Rename artifacts and compute SHA256 shell: bash run: ${{ matrix.rename-script }} @@ -105,6 +105,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} # mark:next-gui-version - TAG_NAME: gui-client-1.0.8 + TAG_NAME: gui-client-1.0.9 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05cf68ad6..89563588f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: - release_name: headless-client-1.0.8 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.0.8 + - release_name: gui-client-1.0.9 config_name: release-drafter-gui-client.yml steps: - uses: release-drafter/release-drafter@v6 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 67433e93c..364044dad 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -58,6 +58,7 @@ jobs: echo "major_version=$MAJOR_VERSION" >> "$GITHUB_OUTPUT" echo "major_minor_version=$MAJOR_MINOR_VERSION" >> "$GITHUB_OUTPUT" - name: Pull and push + if: ${{ steps.set-variables.outputs.artifact == 'gateway' || steps.set-variables.outputs.artifact == 'client' }} run: | set -xe diff --git a/rust/Cargo.lock b/rust/Cargo.lock index ecbbda3e5..189199c72 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.0.8" +version = "1.0.9" dependencies = [ "anyhow", "arboard", diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index e197c12e6..808188625 100644 --- a/rust/gui-client/src-tauri/Cargo.toml +++ b/rust/gui-client/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-gui-client" # mark:next-gui-version -version = "1.0.8" +version = "1.0.9" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/scripts/Makefile b/scripts/Makefile index d8ed4db27..52b992907 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -16,14 +16,14 @@ current-apple-version = 1.0.5 current-android-version = 1.0.4 current-gateway-version = 1.0.7 -current-gui-version = 1.0.7 +current-gui-version = 1.0.8 current-headless-version = 1.0.7 # Tracks the next version to release for each platform next-apple-version = 1.0.6 next-android-version = 1.0.5 next-gateway-version = 1.0.8 -next-gui-version = 1.0.8 +next-gui-version = 1.0.9 next-headless-version = 1.0.8 # macOS uses a slightly different sed syntax diff --git a/website/redirects.js b/website/redirects.js index fe7aff49c..27c2f3798 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -10,7 +10,7 @@ module.exports = [ source: "/dl/firezone-client-gui-windows/latest/x86_64", destination: // mark:current-gui-version - "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.7/firezone-client-gui-windows_1.0.7_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.8/firezone-client-gui-windows_1.0.8_x86_64.msi", permanent: false, }, /* @@ -22,14 +22,14 @@ module.exports = [ source: "/dl/firezone-client-gui-linux/latest/x86_64", destination: // mark:current-gui-version - "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.7/firezone-client-gui-linux_1.0.7_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.8/firezone-client-gui-linux_1.0.8_x86_64.deb", permanent: false, }, { source: "/dl/firezone-client-gui-linux/latest/aarch64", destination: // mark:current-gui-version - "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.7/firezone-client-gui-linux_1.0.7_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.8/firezone-client-gui-linux_1.0.8_aarch64.deb", permanent: false, }, {