From b7ec92e3aaf8d6725767e3a8554dc0ac64b1a7f3 Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 26 May 2025 08:20:05 -0700 Subject: [PATCH] chore(ci): Bump apple clients to 1.5.0 (#9239) --- .github/workflows/_swift.yml | 8 ++++---- rust/Cargo.lock | 2 +- rust/apple-client-ffi/Cargo.toml | 2 +- scripts/bump-versions.sh | 4 ++-- swift/apple/Firezone.xcodeproj/project.pbxproj | 12 ++++++------ website/redirects.js | 4 ++-- website/src/app/api/releases/route.ts | 2 +- website/src/components/Changelog/Apple.tsx | 17 +++++++++++++++++ 8 files changed, 34 insertions(+), 17 deletions(-) diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index 6c925f502..6dd6c9842 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.5.0 + RELEASE_NAME: macos-client-1.5.1 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.5.0.dmg" + artifact-file: "firezone-macos-client-1.5.1.dmg" # mark:next-apple-version - pkg-artifact-file: "firezone-macos-client-1.5.0.pkg" + pkg-artifact-file: "firezone-macos-client-1.5.1.pkg" # mark:next-apple-version - release-name: macos-client-1.5.0 + release-name: macos-client-1.5.1 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 802b4da94..fdfb021f8 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -190,7 +190,7 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "apple-client-ffi" -version = "1.5.0" +version = "1.5.1" dependencies = [ "anyhow", "backoff", diff --git a/rust/apple-client-ffi/Cargo.toml b/rust/apple-client-ffi/Cargo.toml index 60a5b9ad4..22fe35efe 100644 --- a/rust/apple-client-ffi/Cargo.toml +++ b/rust/apple-client-ffi/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "apple-client-ffi" # mark:next-apple-version -version = "1.5.0" +version = "1.5.1" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 3c511c090..155b342a3 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -69,8 +69,8 @@ function update_changelog() { # 6. Run `scripts/bump-versions.sh apple` to update the versions in the codebase. # 7. Commit the changes and open a PR. function apple() { - current_apple_version="1.4.15" - next_apple_version="1.5.0" + current_apple_version="1.5.0" + next_apple_version="1.5.1" update_changelog "website/src/components/Changelog/Apple.tsx" "$current_apple_version" 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;}' {} \; diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index 2284ff6b2..b1515f924 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -565,7 +565,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -607,7 +607,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.5.0; + MARKETING_VERSION = 1.5.1; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -648,7 +648,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.5.0; + MARKETING_VERSION = 1.5.1; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -686,7 +686,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.5.0; + MARKETING_VERSION = 1.5.1; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -860,7 +860,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.5.0; + MARKETING_VERSION = 1.5.1; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -910,7 +910,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.5.0; + MARKETING_VERSION = 1.5.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 0611e9513..97548a68d 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.15/firezone-macos-client-1.4.15.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.0/firezone-macos-client-1.5.0.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.15/firezone-macos-client-1.4.15.pkg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.0/firezone-macos-client-1.5.0.pkg", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 271b8db04..312cfb480 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.4.15", + apple: "1.5.0", // mark:current-android-version android: "1.4.8", // mark:current-gui-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 5c3cfc7a3..de49c9006 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -25,6 +25,23 @@ 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. */} + + + Finalizes the managed configuration support for the macOS client. For + details on how to configure this, see{" "} + + the knowledge base article + + . + + + Fixes a minor bug where the app would report a minor error in the + backend when quitting while signed out. + + Adds a