From 6f68b975584ddd704dd13b57e9f0e078be02157a Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Thu, 20 Feb 2025 15:25:38 +1100 Subject: [PATCH] chore(gui-client): release `v1.4.6` (#8211) --- .github/workflows/_tauri.yml | 10 +++++----- rust/Cargo.lock | 4 ++-- rust/gui-client/src-common/Cargo.toml | 2 +- rust/gui-client/src-tauri/Cargo.toml | 2 +- rust/headless-client/src/ipc_service.rs | 2 +- scripts/bump-versions.sh | 4 ++-- website/redirects.js | 6 +++--- website/src/app/api/releases/route.ts | 2 +- website/src/components/Changelog/GUI.tsx | 5 +++-- 9 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 352edc683..fb586510b 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-22.04 env: # mark:next-gui-version - RELEASE_NAME: gui-client-1.4.6 + RELEASE_NAME: gui-client-1.4.7 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -57,19 +57,19 @@ jobs: pkg-extension: msi env: # mark:next-gui-version - ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.4.6_${{ matrix.arch }} + ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.4.7_${{ matrix.arch }} # mark:next-gui-version - ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.4.6_${{ matrix.arch }} + ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.4.7_${{ matrix.arch }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_CERT_NAME: ${{ secrets.AZURE_CERT_NAME }} # mark:next-gui-version - BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.4.6_${{ matrix.arch }} + BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.4.7_${{ matrix.arch }} # Seems like there's no way to de-dupe env vars that depend on each other # mark:next-gui-version - FIREZONE_GUI_VERSION: 1.4.6 + FIREZONE_GUI_VERSION: 1.4.7 RENAME_SCRIPT: ../../scripts/build/tauri-rename-${{ matrix.os }}.sh TEST_INSTALL_SCRIPT: ../../scripts/tests/gui-client-install-${{ matrix.os }}-${{ matrix.pkg-extension }}.sh TARGET_DIR: ../target diff --git a/rust/Cargo.lock b/rust/Cargo.lock index e095b678e..39d885efb 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2043,7 +2043,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.4.6" +version = "1.4.7" dependencies = [ "anyhow", "atomicwrites", @@ -2088,7 +2088,7 @@ dependencies = [ [[package]] name = "firezone-gui-client-common" -version = "1.4.6" +version = "1.4.7" dependencies = [ "anyhow", "arboard", diff --git a/rust/gui-client/src-common/Cargo.toml b/rust/gui-client/src-common/Cargo.toml index 4d96c0157..dc8420c98 100644 --- a/rust/gui-client/src-common/Cargo.toml +++ b/rust/gui-client/src-common/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-gui-client-common" # mark:next-gui-version -version = "1.4.6" +version = "1.4.7" edition = { workspace = true } license = { workspace = true } diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 8e632a0fc..7475b7021 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.4.6" +version = "1.4.7" description = "Firezone" edition = { workspace = true } default-run = "firezone-gui-client" diff --git a/rust/headless-client/src/ipc_service.rs b/rust/headless-client/src/ipc_service.rs index cbd58d0dd..ddf1ef171 100644 --- a/rust/headless-client/src/ipc_service.rs +++ b/rust/headless-client/src/ipc_service.rs @@ -587,7 +587,7 @@ impl<'a> Handler<'a> { // The IPC service must use the GUI's version number, not the Headless Client's. // But refactoring to separate the IPC service from the Headless Client will take a while. // mark:next-gui-version - get_user_agent(None, "1.4.6"), + get_user_agent(None, "1.4.7"), "client", (), || { diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 4d6bebb0d..6e6289b8f 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -107,8 +107,8 @@ function android() { # 5. Commit the changes and open a PR. Ensure the Changelog is correctly # updated with the changes. function gui() { - current_gui_version="1.4.5" - next_gui_version="1.4.6" + current_gui_version="1.4.6" + next_gui_version="1.4.7" find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gui_version}"'/g;}' {} \; find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gui_version}"'/g;}' {} \; diff --git a/website/redirects.js b/website/redirects.js index 8c0bb248c..5a7a465fe 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -34,7 +34,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.4.5/firezone-client-gui-windows_1.4.5_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.6/firezone-client-gui-windows_1.4.6_x86_64.msi", permanent: false, }, /* @@ -58,14 +58,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.4.5/firezone-client-gui-linux_1.4.5_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.6/firezone-client-gui-linux_1.4.6_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.4.5/firezone-client-gui-linux_1.4.5_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.6/firezone-client-gui-linux_1.4.6_aarch64.deb", permanent: false, }, { diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 7ab679b73..c49000096 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -9,7 +9,7 @@ export async function GET(_req: NextRequest) { // mark:current-android-version android: "1.4.2", // mark:current-gui-version - gui: "1.4.5", + gui: "1.4.6", // mark:current-headless-version headless: "1.4.3", // mark:current-gateway-version diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index b7350f77e..e26273a9b 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -8,7 +8,8 @@ export default function GUI({ os }: { os: OS }) { return ( {/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */} - + + {os === OS.Linux && ( Fixes an upload speed performance regression. @@ -23,7 +24,7 @@ export default function GUI({ os }: { os: OS }) { twice upon shutdown. )} - + Fixes a visual regression where the Settings and About window lost