diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index 1d56c2dfa..88ccb104a 100644 --- a/.github/workflows/_swift.yml +++ b/.github/workflows/_swift.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-24.04 env: # mark:next-apple-version - RELEASE_NAME: macos-client-1.5.9 + RELEASE_NAME: macos-client-1.5.10 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -55,11 +55,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.9.dmg" + artifact-file: "firezone-macos-client-1.5.10.dmg" # mark:next-apple-version - pkg-artifact-file: "firezone-macos-client-1.5.9.pkg" + pkg-artifact-file: "firezone-macos-client-1.5.10.pkg" # mark:next-apple-version - release-name: macos-client-1.5.9 + release-name: macos-client-1.5.10 steps: - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 with: diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 4ab1d0f4a..740f3627d 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -90,8 +90,8 @@ function update_version_variables() { # 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_client_version="1.5.8" - next_apple_client_version="1.5.9" + current_apple_client_version="1.5.9" + next_apple_client_version="1.5.10" update_changelog "website/src/components/Changelog/Apple.tsx" "$current_apple_client_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_client_version}"'/g;}' {} \; diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index baabd7bd2..52c04e723 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -581,7 +581,7 @@ ); "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.5.9; + MARKETING_VERSION = 1.5.10; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; OTHER_SWIFT_FLAGS = "-D UNIFFI"; @@ -625,7 +625,7 @@ ); "LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.5.9; + MARKETING_VERSION = 1.5.10; OTHER_LDFLAGS = "-lconnlib"; OTHER_SWIFT_FLAGS = "-D UNIFFI"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -668,7 +668,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.9; + MARKETING_VERSION = 1.5.10; OTHER_LDFLAGS = "-lconnlib"; OTHER_SWIFT_FLAGS = "-D UNIFFI"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -710,7 +710,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.9; + MARKETING_VERSION = 1.5.10; OTHER_LDFLAGS = "-lconnlib"; OTHER_SWIFT_FLAGS = "-D UNIFFI"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -887,7 +887,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.9; + MARKETING_VERSION = 1.5.10; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -937,7 +937,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.9; + MARKETING_VERSION = 1.5.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 9ef8c5539..9f98fb68f 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.5.8/firezone-macos-client-1.5.8.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.9/firezone-macos-client-1.5.9.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.5.8/firezone-macos-client-1.5.8.pkg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.9/firezone-macos-client-1.5.9.pkg", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index d2529e98c..d08995336 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() { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.5.8", + apple: "1.5.9", // mark:current-android-version android: "1.5.5", // mark:current-gui-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index c7ac9daea..21388e7a6 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -24,7 +24,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. */} - + + Fixes an issue on macOS where DNS resources might fail to be routed properly after many (150+) Firezone session restarts. @@ -40,7 +41,7 @@ export default function Apple() { Fixes an issue where the Resources menu would not populate when launching the app while already connected. - + Fixes an issue where multiple concurrent Firezone macOS clients could