From ef3b4e5dfeb7b9f0bcf9b7e12bb00a7ae12c2d8c Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 8 Jul 2024 21:58:10 -0700 Subject: [PATCH] feat(linux-gui): Bump GUI to 1.1.5 for arm64 support (#5800) --- .github/workflows/_tauri.yml | 22 +++++++++++----------- .github/workflows/ci.yml | 2 +- rust/Cargo.lock | 2 +- rust/gui-client/src-tauri/Cargo.toml | 2 +- scripts/Makefile | 4 ++-- website/redirects.js | 6 +++--- website/src/components/Changelog/GUI.tsx | 16 ++++++---------- 7 files changed, 25 insertions(+), 29 deletions(-) diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 745fd1084..9d308010a 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -26,31 +26,31 @@ jobs: include: - runs-on: ubuntu-20.04 # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.1.5_x86_64 + binary-dest-path: firezone-client-gui-linux_1.1.6_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.1.5_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.1.6_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.5_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.6_x86_64.deb - runs-on: ubuntu-20.04-arm # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.1.5_aarch64 + binary-dest-path: firezone-client-gui-linux_1.1.6_aarch64 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.1.5_aarch64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.1.6_aarch64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.5_aarch64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.6_aarch64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.1.5_x86_64 + binary-dest-path: firezone-client-gui-windows_1.1.6_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.1.5_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.1.6_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.5_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.6_x86_64.msi env: BINARY_DEST_PATH: ${{ matrix.binary-dest-path }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} @@ -96,7 +96,7 @@ jobs: if: ${{ runner.os == 'Windows' }} shell: bash # mark:next-gui-version - run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.5_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.6_x64_en-US.msi - name: Rename artifacts and compute SHA256 shell: bash run: ${{ matrix.rename-script }} @@ -121,6 +121,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} # mark:next-gui-version - TAG_NAME: gui-client-1.1.5 + TAG_NAME: gui-client-1.1.6 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae8ecbcec..21fbda1c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,7 @@ jobs: - release_name: headless-client-1.1.4 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.1.5 + - release_name: gui-client-1.1.6 config_name: release-drafter-gui-client.yml steps: - uses: release-drafter/release-drafter@v6 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 506c8da4d..4201f61b5 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1884,7 +1884,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.1.5" +version = "1.1.6" dependencies = [ "anyhow", "arboard", diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 710c410fa..d421ae237 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.1.5" +version = "1.1.6" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/scripts/Makefile b/scripts/Makefile index 0fe123212..3801f961f 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -16,14 +16,14 @@ current-apple-version = 1.1.2 current-android-version = 1.1.3 current-gateway-version = 1.1.2 -current-gui-version = 1.1.4 +current-gui-version = 1.1.5 current-headless-version = 1.1.3 # Tracks the next version to release for each platform next-apple-version = 1.1.3 next-android-version = 1.1.4 next-gateway-version = 1.1.3 -next-gui-version = 1.1.5 +next-gui-version = 1.1.6 next-headless-version = 1.1.4 # macOS uses a slightly different sed syntax diff --git a/website/redirects.js b/website/redirects.js index cb13ff0aa..854fe4a8c 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.1.4/firezone-client-gui-windows_1.1.4_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.5/firezone-client-gui-windows_1.1.5_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.1.4/firezone-client-gui-linux_1.1.4_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.5/firezone-client-gui-linux_1.1.5_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.1.4/firezone-client-gui-linux_1.1.4_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.5/firezone-client-gui-linux_1.1.5_aarch64.deb", permanent: false, }, { diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index e76c7cad8..4102dd4c8 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -7,14 +7,11 @@ export default function GUI({ title }: { title: string }) { title === "Windows" ? "/dl/firezone-client-gui-windows/:version/:arch" : "/dl/firezone-client-gui-linux/:version/:arch"; - const arches = - title === "Windows" - ? ["x86_64"] - : ["x86_64", "aarch64"]; + const arches = title === "Windows" ? ["x86_64"] : ["x86_64", "aarch64"]; return ( - {/* +
  • The Linux GUI Client is now{" "} @@ -23,10 +20,10 @@ export default function GUI({ title }: { title: string }) { className="text-accent-500 underline hover:no-underline" > built for both x86-64 and ARM64 - {" "} +
- */} +
  • @@ -37,10 +34,9 @@ export default function GUI({ title }: { title: string }) { > issue {" "} - where a stale DNS cache could prevent traffic from - routing to DNS Resources if they were updated while the Client was - signed in. where a stale DNS cache could prevent traffic from routing to DNS + Resources if they were updated while the Client was signed in. where + a stale DNS cache could prevent traffic from routing to DNS Resources if they were updated while the Client was signed in.