From 6670741dee5ebe9768b2716510684497e6c21834 Mon Sep 17 00:00:00 2001 From: Jamil Date: Thu, 16 Jan 2025 16:07:25 -0800 Subject: [PATCH] chore: Bump apple clients to 1.4.0 (#7785) Bumps Apple clients to the 1.4.0 release. They're already live. --- .github/workflows/_swift.yml | 4 ++-- .github/workflows/ci.yml | 2 +- rust/Cargo.lock | 2 +- rust/connlib/clients/apple/Cargo.toml | 2 +- scripts/Makefile | 4 ++-- swift/apple/Firezone.xcodeproj/project.pbxproj | 12 ++++++------ website/redirects.js | 2 +- website/src/app/api/releases/route.ts | 2 +- website/src/components/Changelog/Apple.tsx | 5 +++-- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index c98e9dfee..6c3b29a8f 100644 --- a/.github/workflows/_swift.yml +++ b/.github/workflows/_swift.yml @@ -35,9 +35,9 @@ 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.0.dmg" + artifact-file: "firezone-macos-client-1.4.1.dmg" # mark:next-apple-version - release-name: macos-client-1.4.0 + release-name: macos-client-1.4.1 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d722640b4..d35b772d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: - release_name: gui-client-1.4.1 config_name: release-drafter-gui-client.yml # mark:next-apple-version - - release_name: macos-client-1.4.0 + - release_name: macos-client-1.4.1 config_name: release-drafter-macos-client.yml # mark:next-android-version - release_name: android-client-1.4.1 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index cccabe335..b8dc2f12f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1069,7 +1069,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.4.0" +version = "1.4.1" dependencies = [ "anyhow", "backoff", diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index 2e24d412f..9e19197fe 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.0" +version = "1.4.1" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/Makefile b/scripts/Makefile index a4c05a38e..16a00917e 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -18,14 +18,14 @@ # 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.9 +current-apple-version = 1.4.0 current-android-version = 1.4.0 current-gateway-version = 1.4.2 current-gui-version = 1.4.0 current-headless-version = 1.4.0 # Tracks the next version to release for each platform -next-apple-version = 1.4.0 +next-apple-version = 1.4.1 next-android-version = 1.4.1 next-gateway-version = 1.4.3 next-gui-version = 1.4.1 diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index e9285376d..d9e14e214 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -544,7 +544,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.4.0; + MARKETING_VERSION = 1.4.1; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -586,7 +586,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.4.0; + MARKETING_VERSION = 1.4.1; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -627,7 +627,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.0; + MARKETING_VERSION = 1.4.1; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -665,7 +665,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.0; + MARKETING_VERSION = 1.4.1; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -830,7 +830,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.4.0; + MARKETING_VERSION = 1.4.1; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -879,7 +879,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.4.0; + MARKETING_VERSION = 1.4.1; 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 1b7acb973..0b84d9457 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -10,7 +10,7 @@ module.exports = [ source: "/dl/firezone-client-macos/latest", destination: // mark:current-apple-version - "https://www.github.com/firezone/firezone/releases/download/macos-client-1.3.9/firezone-macos-client-1.3.9.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.0/firezone-macos-client-1.4.0.dmg", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 9df9f7276..bf6d53fb2 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -5,7 +5,7 @@ export async function GET(_req: NextRequest) { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.3.9", + apple: "1.4.0", // mark:current-android-version android: "1.4.0", // mark:current-gui-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index a48f97ea3..4f8ab115a 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -19,7 +19,8 @@ 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. */} - + + Adds download links and CI configuration to publish the macOS app as a standalone package. @@ -52,7 +53,7 @@ export default function Apple() { Fixes an issue where large DNS responses were incorrectly discarded. - + Fixes an issue where network roaming would cause Firezone to become