diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index d07a13ce3..be691a284 100644 --- a/.github/workflows/_swift.yml +++ b/.github/workflows/_swift.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-22.04-xlarge env: # mark:next-apple-version - RELEASE_NAME: macos-client-1.5.4 + RELEASE_NAME: macos-client-1.5.5 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.4.dmg" + artifact-file: "firezone-macos-client-1.5.5.dmg" # mark:next-apple-version - pkg-artifact-file: "firezone-macos-client-1.5.4.pkg" + pkg-artifact-file: "firezone-macos-client-1.5.5.pkg" # mark:next-apple-version - release-name: macos-client-1.5.4 + release-name: macos-client-1.5.5 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 0224515f0..5dd5c062b 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -319,7 +319,7 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "apple-client-ffi" -version = "1.5.4" +version = "1.5.5" dependencies = [ "anyhow", "backoff", diff --git a/rust/apple-client-ffi/Cargo.toml b/rust/apple-client-ffi/Cargo.toml index db68f92a6..bb5db69f9 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.4" +version = "1.5.5" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 05bd887c7..f2fe3fecf 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.3" - next_apple_client_version="1.5.4" + current_apple_client_version="1.5.4" + next_apple_client_version="1.5.5" 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 d7d9495ed..89491db21 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -564,7 +564,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.5.4; + MARKETING_VERSION = 1.5.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; @@ -606,7 +606,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 1.5.4; + MARKETING_VERSION = 1.5.5; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -647,7 +647,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.4; + MARKETING_VERSION = 1.5.5; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -685,7 +685,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.4; + MARKETING_VERSION = 1.5.5; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)"; @@ -859,7 +859,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.4; + MARKETING_VERSION = 1.5.5; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -909,7 +909,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.4; + MARKETING_VERSION = 1.5.5; 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 8256e4821..5645ecd0b 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.3/firezone-macos-client-1.5.3.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.4/firezone-macos-client-1.5.4.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.3/firezone-macos-client-1.5.3.pkg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.4/firezone-macos-client-1.5.4.pkg", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 072c7f8d3..a96014e53 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.5.3", + apple: "1.5.4", // mark:current-android-version android: "1.5.2", // mark:current-gui-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index 5af03dbac..b6de6e506 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 where certain log files would not be recreated after logs were cleared. @@ -36,7 +37,7 @@ export default function Apple() { Fixes an issue where Firezone failed to sign-in on systems with non-ASCII characters in their kernel build name. - + Fixes an issue where connections would fail to establish if both