From 25c708fb43c33defcca8362265d7145966a20d46 Mon Sep 17 00:00:00 2001 From: Jamil Date: Tue, 11 Mar 2025 21:09:49 -0700 Subject: [PATCH] ci: Bump apple clients to 1.4.6 (#8418) --- .github/workflows/_swift.yml | 6 +++--- rust/Cargo.lock | 2 +- rust/connlib/clients/apple/Cargo.toml | 2 +- scripts/bump-versions.sh | 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 +++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index 8b0bade4b..8cfa8ce08 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.6 + RELEASE_NAME: macos-client-1.4.7 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -53,9 +53,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.6.dmg" + artifact-file: "firezone-macos-client-1.4.7.dmg" # mark:next-apple-version - release-name: macos-client-1.4.6 + release-name: macos-client-1.4.7 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/rust/Cargo.lock b/rust/Cargo.lock index fb9fe86f8..e6b603f5c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1070,7 +1070,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.4.6" +version = "1.4.7" dependencies = [ "anyhow", "backoff", diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index e1db51a5e..1e1c200dc 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.6" +version = "1.4.7" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 67cd223dc..f1bb5f445 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.5" - next_apple_version="1.4.6" + current_apple_version="1.4.6" + next_apple_version="1.4.7" 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;}' {} \; diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index d8734d930..05a8cdd33 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.6; + MARKETING_VERSION = 1.4.7; 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.6; + MARKETING_VERSION = 1.4.7; 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.6; + MARKETING_VERSION = 1.4.7; 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.6; + MARKETING_VERSION = 1.4.7; 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.6; + MARKETING_VERSION = 1.4.7; 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.6; + MARKETING_VERSION = 1.4.7; 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 5504e40ca..2c5a80d32 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.4.5/firezone-macos-client-1.4.5.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.6/firezone-macos-client-1.4.6.dmg", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 993c7b2b3..df570fb19 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.5", + apple: "1.4.6", // mark:current-android-version android: "1.4.3", // mark:current-gui-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 9afbb6835..5145f55b8 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. */} - + + Shows friendlier and more-human alert messages when something goes wrong. @@ -28,7 +29,7 @@ export default function Apple() { Fixes a bug that prevented certain Resource fields from being updated when they were updated in the admin portal. - + Fixes an issue where the update checker would not properly notify the