From 1dda915376505eb564bde76f14dd0ece9c4b22dc Mon Sep 17 00:00:00 2001 From: Jamil Date: Fri, 8 Nov 2024 14:58:06 -0800 Subject: [PATCH] ci: Publish new clients (#7291) Fixes the roaming bug. --- .github/workflows/_build_artifacts.yml | 4 ++-- .github/workflows/_tauri.yml | 8 ++++---- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish.yml | 2 +- kotlin/android/app/build.gradle.kts | 2 +- rust/Cargo.lock | 10 +++++----- rust/connlib/clients/android/Cargo.toml | 2 +- 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/Cargo.toml | 2 +- rust/headless-client/src/ipc_service.rs | 2 +- scripts/Makefile | 16 ++++++++-------- swift/apple/Firezone.xcodeproj/project.pbxproj | 12 ++++++------ website/redirects.js | 12 ++++++------ website/src/app/api/releases/route.ts | 8 ++++---- website/src/components/Changelog/Android.tsx | 11 ++++++----- website/src/components/Changelog/Apple.tsx | 10 ++++++---- website/src/components/Changelog/GUI.tsx | 5 +++-- website/src/components/Changelog/Headless.tsx | 5 +++-- 20 files changed, 63 insertions(+), 58 deletions(-) diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index aa866354b..f79d1eb39 100644 --- a/.github/workflows/_build_artifacts.yml +++ b/.github/workflows/_build_artifacts.yml @@ -155,9 +155,9 @@ jobs: artifact: firezone-client-headless-linux image_name: client # mark:next-headless-version - release_name: headless-client-1.3.6 + release_name: headless-client-1.3.7 # mark:next-headless-version - version: 1.3.6 + version: 1.3.7 - package: firezone-relay artifact: firezone-relay image_name: relay diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 543ff8bc2..a580d6a4b 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -46,19 +46,19 @@ jobs: syms-extension: pdb env: # mark:next-gui-version - ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.3.12_${{ matrix.arch }} + ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.3.13_${{ matrix.arch }} # mark:next-gui-version - ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.3.12_${{ matrix.arch }} + ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.3.13_${{ 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.3.12_${{ matrix.arch }} + BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.3.13_${{ 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.3.12 + FIREZONE_GUI_VERSION: 1.3.13 RENAME_SCRIPT: ../../scripts/build/tauri-rename-${{ matrix.os }}.sh TARGET_DIR: ../target UPLOAD_SCRIPT: ../../scripts/build/tauri-upload-${{ matrix.os }}.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8569b1f80..e90da1969 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,10 +50,10 @@ jobs: - release_name: gateway-1.4.1 config_name: release-drafter-gateway.yml # mark:next-headless-version - - release_name: headless-client-1.3.6 + - release_name: headless-client-1.3.7 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.3.12 + - release_name: gui-client-1.3.13 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 d5bab5df8..ff0c16d05 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,7 +42,7 @@ jobs: elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then ARTIFACT=client # mark:next-headless-version - VERSION="1.3.6" + VERSION="1.3.7" else echo "Shouldn't have gotten here. Exiting." exit 1 diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index eab03d403..fe998f410 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -53,7 +53,7 @@ android { targetSdk = 35 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.3.7" + versionName = "1.3.8" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 62d21a701..54a1b801f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1046,7 +1046,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.3.7" +version = "1.3.8" dependencies = [ "android_log-sys", "backoff", @@ -1074,7 +1074,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.3.9" +version = "1.3.10" dependencies = [ "anyhow", "backoff", @@ -1999,7 +1999,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.3.12" +version = "1.3.13" dependencies = [ "anyhow", "atomicwrites", @@ -2042,7 +2042,7 @@ dependencies = [ [[package]] name = "firezone-gui-client-common" -version = "1.3.12" +version = "1.3.13" dependencies = [ "anyhow", "arboard", @@ -2081,7 +2081,7 @@ dependencies = [ [[package]] name = "firezone-headless-client" -version = "1.3.6" +version = "1.3.7" dependencies = [ "anyhow", "atomicwrites", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index e4208b72c..7a4e475a0 100644 --- a/rust/connlib/clients/android/Cargo.toml +++ b/rust/connlib/clients/android/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-android" # mark:next-android-version -version = "1.3.7" +version = "1.3.8" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index b0c410e41..b61fe9447 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.3.9" +version = "1.3.10" edition = "2021" [build-dependencies] diff --git a/rust/gui-client/src-common/Cargo.toml b/rust/gui-client/src-common/Cargo.toml index c9575c5af..003eeb5a0 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.3.12" +version = "1.3.13" edition = "2021" [dependencies] diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index e295a4f23..dc6974f22 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.3.12" +version = "1.3.13" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/rust/headless-client/Cargo.toml b/rust/headless-client/Cargo.toml index 67d95f1f7..8e1bd8f33 100644 --- a/rust/headless-client/Cargo.toml +++ b/rust/headless-client/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-headless-client" # mark:next-headless-version -version = "1.3.6" +version = "1.3.7" edition = "2021" authors = ["Firezone, Inc."] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/headless-client/src/ipc_service.rs b/rust/headless-client/src/ipc_service.rs index 4585818b8..0ce7bfe62 100644 --- a/rust/headless-client/src/ipc_service.rs +++ b/rust/headless-client/src/ipc_service.rs @@ -589,7 +589,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.3.12"), + get_user_agent(None, "1.3.13"), "client", (), ExponentialBackoffBuilder::default() diff --git a/scripts/Makefile b/scripts/Makefile index 46abb391a..60bfc145d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -18,18 +18,18 @@ # the relevant versions in order to push to a newly drafted release. # Tracks the current version to use for generating download links and changelogs -current-apple-version = 1.3.8 -current-android-version = 1.3.6 +current-apple-version = 1.3.9 +current-android-version = 1.3.7 current-gateway-version = 1.4.0 -current-gui-version = 1.3.11 -current-headless-version = 1.3.5 +current-gui-version = 1.3.12 +current-headless-version = 1.3.6 # Tracks the next version to release for each platform -next-apple-version = 1.3.9 -next-android-version = 1.3.7 +next-apple-version = 1.3.10 +next-android-version = 1.3.8 next-gateway-version = 1.4.1 -next-gui-version = 1.3.12 -next-headless-version = 1.3.6 +next-gui-version = 1.3.13 +next-headless-version = 1.3.7 # macOS uses a slightly different sed syntax ifeq ($(shell uname),Darwin) diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index 54f5814d0..315b317ce 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -585,7 +585,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.3.9; + MARKETING_VERSION = 1.3.10; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension"; @@ -627,7 +627,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.3.9; + MARKETING_VERSION = 1.3.10; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -671,7 +671,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.3.9; + MARKETING_VERSION = 1.3.10; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -714,7 +714,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.3.9; + MARKETING_VERSION = 1.3.10; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -908,7 +908,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MARKETING_VERSION = 1.3.9; + MARKETING_VERSION = 1.3.10; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -959,7 +959,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MARKETING_VERSION = 1.3.9; + MARKETING_VERSION = 1.3.10; 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 0118fd89d..efd0e895f 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.3.11/firezone-client-gui-windows_1.3.11_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.3.12/firezone-client-gui-windows_1.3.12_x86_64.msi", permanent: false, }, /* @@ -22,35 +22,35 @@ 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.3.11/firezone-client-gui-linux_1.3.11_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.3.12/firezone-client-gui-linux_1.3.12_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.3.11/firezone-client-gui-linux_1.3.11_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.3.12/firezone-client-gui-linux_1.3.12_aarch64.deb", permanent: false, }, { source: "/dl/firezone-client-headless-linux/latest/x86_64", destination: // mark:current-headless-version - "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.5/firezone-client-headless-linux_1.3.5_x86_64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.6/firezone-client-headless-linux_1.3.6_x86_64", permanent: false, }, { source: "/dl/firezone-client-headless-linux/latest/aarch64", destination: // mark:current-headless-version - "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.5/firezone-client-headless-linux_1.3.5_aarch64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.6/firezone-client-headless-linux_1.3.6_aarch64", permanent: false, }, { source: "/dl/firezone-client-headless-linux/latest/armv7", destination: // mark:current-headless-version - "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.5/firezone-client-headless-linux_1.3.5_armv7", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.6/firezone-client-headless-linux_1.3.6_armv7", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index c46343b13..9daf2bfc2 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -11,13 +11,13 @@ export async function GET(_req: NextRequest) { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.3.8", + apple: "1.3.9", // mark:current-android-version - android: "1.3.6", + android: "1.3.7", // mark:current-gui-version - gui: "1.3.11", + gui: "1.3.12", // mark:current-headless-version - headless: "1.3.5", + headless: "1.3.6", // mark:current-gateway-version gateway: "1.4.0", }; diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index 07620a7ac..87f22b6f5 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -11,7 +11,8 @@ export default function Android() { title="Android" > {/* 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. */} - + + Mitigates a crash in case the maximum packet size is not respected. @@ -19,10 +20,10 @@ export default function Android() { Prevents re-connections to the portal from hanging for longer than 5s. - Fixes an issue where network roaming would cause Firezone to become - unresponsive. - - + Fixes an issue where network roaming would cause Firezone to become + unresponsive. + + Handles DNS queries over TCP correctly. diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 86ab906af..6a5dd6e90 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -12,6 +12,12 @@ export default function Apple() { > {/* 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. */} + + + Fixes an issue where network roaming would cause Firezone to become + unresponsive. + + Mitigates a crash in case the maximum packet size is not respected. @@ -19,10 +25,6 @@ export default function Apple() { Prevents re-connections to the portal from hanging for longer than 5s. - - Fixes an issue where network roaming would cause Firezone to become - unresponsive. - Handles DNS queries over TCP correctly. diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index a07dab0ae..431ab17f4 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -14,12 +14,13 @@ export default function GUI({ title }: { title: string }) { 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. */} - + + Fixes an issue where network roaming would cause Firezone to become unresponsive. - + Mitigates a crash in case the maximum packet size is not respected. diff --git a/website/src/components/Changelog/Headless.tsx b/website/src/components/Changelog/Headless.tsx index 5042cbed2..de567be9f 100644 --- a/website/src/components/Changelog/Headless.tsx +++ b/website/src/components/Changelog/Headless.tsx @@ -11,7 +11,8 @@ export default function Headless() { 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. */} - + + Mitigates a crash in case the maximum packet size is not respected. @@ -26,7 +27,7 @@ export default function Headless() { Fixes an issue where subsequent SIGHUP signals after the first one were ignored. - + Handles DNS queries over TCP correctly.