From 5db8e20f3bb01cc1ecc59f95afa2ff4f32ef683b Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 21 Apr 2025 14:45:16 -0700 Subject: [PATCH] chore: release Apple and GUI clients (#8882) - Apple clients 1.4.12 - GUI clients 1.4.11 --- .github/workflows/_swift.yml | 8 ++++---- .github/workflows/_tauri.yml | 10 +++++----- rust/Cargo.lock | 6 +++--- rust/connlib/clients/apple/Cargo.toml | 2 +- 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 | 8 ++++---- swift/apple/Firezone.xcodeproj/project.pbxproj | 12 ++++++------ website/redirects.js | 10 +++++----- website/src/app/api/releases/route.ts | 4 ++-- website/src/components/Changelog/Apple.tsx | 5 +++-- website/src/components/Changelog/GUI.tsx | 5 +++-- 13 files changed, 39 insertions(+), 37 deletions(-) diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index 198eb5a4c..bbe07c0c5 100644 --- a/.github/workflows/_swift.yml +++ b/.github/workflows/_swift.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04 env: # mark:next-apple-version - RELEASE_NAME: macos-client-1.4.12 + RELEASE_NAME: macos-client-1.4.13 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -53,11 +53,11 @@ jobs: build-script: scripts/build/macos-standalone.sh upload-script: scripts/upload/github-release.sh # mark:next-apple-version - artifact-file: "firezone-macos-client-1.4.12.dmg" + artifact-file: "firezone-macos-client-1.4.13.dmg" # mark:next-apple-version - pkg-artifact-file: "firezone-macos-client-1.4.12.pkg" + pkg-artifact-file: "firezone-macos-client-1.4.13.pkg" # mark:next-apple-version - release-name: macos-client-1.4.12 + release-name: macos-client-1.4.13 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 438c0f8b8..280722942 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.11 + RELEASE_NAME: gui-client-1.4.12 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.11_${{ matrix.arch }} + ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.4.12_${{ matrix.arch }} # mark:next-gui-version - ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.4.11_${{ matrix.arch }} + ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.4.12_${{ 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.11_${{ matrix.arch }} + BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.4.12_${{ 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.11 + FIREZONE_GUI_VERSION: 1.4.12 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 3dc219b0c..d6517dfe6 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1222,7 +1222,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.4.12" +version = "1.4.13" dependencies = [ "anyhow", "backoff", @@ -2243,7 +2243,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.4.11" +version = "1.4.12" dependencies = [ "anyhow", "atomicwrites", @@ -2288,7 +2288,7 @@ dependencies = [ [[package]] name = "firezone-gui-client-common" -version = "1.4.11" +version = "1.4.12" dependencies = [ "anyhow", "arboard", diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index a78104804..dd90bf6f2 100644 --- a/rust/connlib/clients/apple/Cargo.toml +++ b/rust/connlib/clients/apple/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-apple" # mark:next-apple-version -version = "1.4.12" +version = "1.4.13" edition = { workspace = true } license = { workspace = true } diff --git a/rust/gui-client/src-common/Cargo.toml b/rust/gui-client/src-common/Cargo.toml index e3a6d5096..603a5ec21 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.11" +version = "1.4.12" 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 fdc1f09ba..4221a978c 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.11" +version = "1.4.12" 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 2a2197b96..1096844b6 100644 --- a/rust/headless-client/src/ipc_service.rs +++ b/rust/headless-client/src/ipc_service.rs @@ -585,7 +585,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.11"), + get_user_agent(None, "1.4.12"), "client", (), || { diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 93f2c58c2..3112645e9 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -46,8 +46,8 @@ function cargo_update_workspace() { # 7. Commit the changes and open a PR. Ensure the Changelog is correctly # updated with the changes. function apple() { - current_apple_version="1.4.11" - next_apple_version="1.4.12" + current_apple_version="1.4.12" + next_apple_version="1.4.13" find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_apple_version}"'/g;}' {} \; find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_apple_version}"'/g;}' {} \; @@ -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.10" - next_gui_version="1.4.11" + current_gui_version="1.4.11" + next_gui_version="1.4.12" 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/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index 67b56a54f..ae10cf86d 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -545,7 +545,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.4.12; + MARKETING_VERSION = 1.4.13; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -587,7 +587,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.4.12; + MARKETING_VERSION = 1.4.13; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -628,7 +628,7 @@ "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/debug"; "LIBRARY_SEARCH_PATHS[arch=arm64e]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/debug"; "LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(CONNLIB_TARGET_DIR)/x86_64-apple-darwin/debug"; - MARKETING_VERSION = 1.4.12; + MARKETING_VERSION = 1.4.13; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -666,7 +666,7 @@ "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/release"; "LIBRARY_SEARCH_PATHS[arch=arm64e]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/release"; "LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(CONNLIB_TARGET_DIR)/x86_64-apple-darwin/release"; - MARKETING_VERSION = 1.4.12; + MARKETING_VERSION = 1.4.13; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -838,7 +838,7 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.4.12; + MARKETING_VERSION = 1.4.13; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -888,7 +888,7 @@ LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.4.12; + MARKETING_VERSION = 1.4.13; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/website/redirects.js b/website/redirects.js index f5571b58c..143b1c598 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -10,14 +10,14 @@ module.exports = [ source: "/dl/firezone-client-macos/latest", destination: // mark:current-apple-version - "https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.11/firezone-macos-client-1.4.11.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.12/firezone-macos-client-1.4.12.dmg", permanent: false, }, { source: "/dl/firezone-client-macos/pkg/latest", destination: // mark:current-apple-version - "https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.11/firezone-macos-client-1.4.11.pkg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.12/firezone-macos-client-1.4.12.pkg", permanent: false, }, /* @@ -41,7 +41,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.10/firezone-client-gui-windows_1.4.10_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.11/firezone-client-gui-windows_1.4.11_x86_64.msi", permanent: false, }, /* @@ -65,14 +65,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.10/firezone-client-gui-linux_1.4.10_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.11/firezone-client-gui-linux_1.4.11_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.10/firezone-client-gui-linux_1.4.10_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.11/firezone-client-gui-linux_1.4.11_aarch64.deb", permanent: false, }, { diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index af05b544a..f87b73109 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -5,11 +5,11 @@ export async function GET(_req: NextRequest) { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.4.11", + apple: "1.4.12", // mark:current-android-version android: "1.4.7", // mark:current-gui-version - gui: "1.4.10", + gui: "1.4.11", // mark:current-headless-version headless: "1.4.6", // mark:current-gateway-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 3406aed77..9c0136227 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -23,11 +23,12 @@ export default function Apple() { 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. */} - + + Improves performance of relayed connections on IPv4-only systems. - + Fixes an issue where the app would hang on launch if another VPN app diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index 74da48328..fc1b4b149 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -8,11 +8,12 @@ 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. */} - + + Improves performance of relayed connections on IPv4-only systems. - + {os === OS.Linux && (