diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index 948ac5682..70f0d3c10 100644 --- a/.github/workflows/_build_artifacts.yml +++ b/.github/workflows/_build_artifacts.yml @@ -247,9 +247,9 @@ jobs: artifact: firezone-gateway image_name: gateway # mark:next-gateway-version - release_name: gateway-1.4.11 + release_name: gateway-1.4.12 # mark:next-gateway-version - version: 1.4.11 + version: 1.4.12 - package: http-test-server artifact: http-test-server image_name: http-test-server @@ -417,7 +417,7 @@ jobs: - name: relay - name: gateway # mark:next-gateway-version - version: 1.4.11 + version: 1.4.12 - name: client # mark:next-client-version version: 1.0.6 diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index cade19091..e16a4abc2 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.3 + RELEASE_NAME: macos-client-1.5.4 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.3.dmg" + artifact-file: "firezone-macos-client-1.5.4.dmg" # mark:next-apple-version - pkg-artifact-file: "firezone-macos-client-1.5.3.pkg" + pkg-artifact-file: "firezone-macos-client-1.5.4.pkg" # mark:next-apple-version - release-name: macos-client-1.5.3 + release-name: macos-client-1.5.4 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 28217d549..6f0a8a8b0 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-22.04 env: # mark:next-gui-version - RELEASE_NAME: gui-client-1.5.4 + RELEASE_NAME: gui-client-1.5.5 steps: - uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0 if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}" @@ -66,19 +66,19 @@ jobs: pkg-extension: msi env: # mark:next-gui-version - ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.5.4_${{ matrix.arch }} + ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.5.5_${{ matrix.arch }} # mark:next-gui-version - ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.5.4_${{ matrix.arch }} + ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.5.5_${{ matrix.arch }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_CERT_NAME: ${{ secrets.AZURE_CERT_NAME }} # mark:next-gui-version - BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.5.4_${{ matrix.arch }} + BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.5.5_${{ matrix.arch }} # Seems like there's no way to de-dupe env vars that depend on each other # mark:next-gui-version - FIREZONE_GUI_VERSION: 1.5.4 + FIREZONE_GUI_VERSION: 1.5.5 RENAME_SCRIPT: ../../scripts/build/tauri-rename-${{ matrix.os }}.sh TEST_INSTALL_SCRIPT: ../../scripts/tests/gui-client-install-${{ matrix.os }}-${{ matrix.pkg-extension }}.sh TARGET_DIR: ../target diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e2a184d0..27df29522 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -180,7 +180,7 @@ jobs: matrix: include: # mark:next-gateway-version - - release_name: gateway-1.4.11 + - release_name: gateway-1.4.12 config_name: release-drafter-gateway.yml # mark:next-headless-version - release_name: headless-client-1.5.1 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5cda12c35..24dac80bd 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,7 +38,7 @@ jobs: if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then ARTIFACT=gateway # mark:next-gateway-version - VERSION="1.4.11" + VERSION="1.4.12" elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then ARTIFACT=client # mark:next-headless-version diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 40ce61c5f..47309db43 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -319,7 +319,7 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" [[package]] name = "apple-client-ffi" -version = "1.5.3" +version = "1.5.4" dependencies = [ "anyhow", "backoff", @@ -2346,7 +2346,7 @@ dependencies = [ [[package]] name = "firezone-gateway" -version = "1.4.11" +version = "1.4.12" dependencies = [ "anyhow", "backoff", @@ -2394,7 +2394,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.5.4" +version = "1.5.5" dependencies = [ "admx-macro", "anyhow", diff --git a/rust/apple-client-ffi/Cargo.toml b/rust/apple-client-ffi/Cargo.toml index acfd331a7..db68f92a6 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.3" +version = "1.5.4" edition = { workspace = true } license = { workspace = true } diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml index 85ff9e866..21095e87b 100644 --- a/rust/gateway/Cargo.toml +++ b/rust/gateway/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-gateway" # mark:next-gateway-version -version = "1.4.11" +version = "1.4.12" edition = { workspace = true } license = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 40ad31f90..30f6e3d52 100644 --- a/rust/gui-client/src-tauri/Cargo.toml +++ b/rust/gui-client/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-gui-client" # mark:next-gui-version -version = "1.5.4" +version = "1.5.5" description = "Firezone" edition = { workspace = true } default-run = "firezone-gui-client" diff --git a/rust/gui-client/vite.config.ts b/rust/gui-client/vite.config.ts index 1aeed849e..32438d57c 100644 --- a/rust/gui-client/vite.config.ts +++ b/rust/gui-client/vite.config.ts @@ -15,7 +15,7 @@ export default defineConfig({ define: { // mark:next-gui-version - __APP_VERSION__: JSON.stringify("1.5.4"), + __APP_VERSION__: JSON.stringify("1.5.5"), __GIT_VERSION__: JSON.stringify(gitVersion), }, diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 95ce13432..c112e53aa 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.2" - next_apple_client_version="1.5.3" + current_apple_client_version="1.5.3" + next_apple_client_version="1.5.4" 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;}' {} \; @@ -151,8 +151,8 @@ function android() { # 4. Run `scripts/bump-versions.sh gui` to update the versions in the codebase. # 5. Commit the changes and open a PR. function gui() { - current_gui_client_version="1.5.3" - next_gui_client_version="1.5.4" + current_gui_client_version="1.5.4" + next_gui_client_version="1.5.5" update_changelog "website/src/components/Changelog/GUI.tsx" "$current_gui_client_version" find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gui_client_version}"'/g;}' {} \; @@ -198,8 +198,8 @@ function headless() { # 3. Run `scripts/bump-versions.sh gateway` to update the versions in the codebase. # 4. Commit the changes and open a PR. function gateway() { - current_gateway_version="1.4.10" - next_gateway_version="1.4.11" + current_gateway_version="1.4.11" + next_gateway_version="1.4.12" update_changelog "website/src/components/Changelog/Gateway.tsx" "$current_gateway_version" find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-gateway-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gateway_version}"'/g;}' {} \; diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index e76678f39..d7d9495ed 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.3; + MARKETING_VERSION = 1.5.4; 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.3; + MARKETING_VERSION = 1.5.4; 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.3; + MARKETING_VERSION = 1.5.4; 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.3; + MARKETING_VERSION = 1.5.4; 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.3; + MARKETING_VERSION = 1.5.4; 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.3; + MARKETING_VERSION = 1.5.4; 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 0b36599c1..892ccaa07 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.2/firezone-macos-client-1.5.2.dmg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.3/firezone-macos-client-1.5.3.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.2/firezone-macos-client-1.5.2.pkg", + "https://www.github.com/firezone/firezone/releases/download/macos-client-1.5.3/firezone-macos-client-1.5.3.pkg", permanent: false, }, /* @@ -41,7 +41,7 @@ module.exports = [ source: "/dl/firezone-client-gui-windows/latest/x86_64", destination: // mark:current-gui-version - "https://www.github.com/firezone/firezone/releases/download/gui-client-1.5.3/firezone-client-gui-windows_1.5.3_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.5.4/firezone-client-gui-windows_1.5.4_x86_64.msi", permanent: false, }, /* @@ -65,14 +65,14 @@ module.exports = [ source: "/dl/firezone-client-gui-linux/latest/x86_64", destination: // mark:current-gui-version - "https://www.github.com/firezone/firezone/releases/download/gui-client-1.5.3/firezone-client-gui-linux_1.5.3_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.5.4/firezone-client-gui-linux_1.5.4_x86_64.deb", permanent: false, }, { source: "/dl/firezone-client-gui-linux/latest/aarch64", destination: // mark:current-gui-version - "https://www.github.com/firezone/firezone/releases/download/gui-client-1.5.3/firezone-client-gui-linux_1.5.3_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.5.4/firezone-client-gui-linux_1.5.4_aarch64.deb", permanent: false, }, { @@ -105,21 +105,21 @@ module.exports = [ source: "/dl/firezone-gateway/latest/x86_64", destination: // mark:current-gateway-version - "https://www.github.com/firezone/firezone/releases/download/gateway-1.4.10/firezone-gateway_1.4.10_x86_64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.4.11/firezone-gateway_1.4.11_x86_64", permanent: false, }, { source: "/dl/firezone-gateway/latest/aarch64", destination: // mark:current-gateway-version - "https://www.github.com/firezone/firezone/releases/download/gateway-1.4.10/firezone-gateway_1.4.10_aarch64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.4.11/firezone-gateway_1.4.11_aarch64", permanent: false, }, { source: "/dl/firezone-gateway/latest/armv7", destination: // mark:current-gateway-version - "https://www.github.com/firezone/firezone/releases/download/gateway-1.4.10/firezone-gateway_1.4.10_armv7", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.4.11/firezone-gateway_1.4.11_armv7", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index d2c903038..cc57fea14 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -5,15 +5,15 @@ export async function GET(_req: NextRequest) { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.5.2", + apple: "1.5.3", // mark:current-android-version android: "1.5.1", // mark:current-gui-version - gui: "1.5.3", + gui: "1.5.4", // mark:current-headless-version headless: "1.5.0", // mark:current-gateway-version - gateway: "1.4.10", + gateway: "1.4.11", }; return NextResponse.json(versions, { diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index d66569ee7..0a2e3dc2f 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -24,12 +24,13 @@ 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 connections would fail to establish if both Client and Gateway were behind symmetric NAT. - + Uses the new IP stack setting for DNS resources, which allows DNS diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index d150ce85c..bb5f5cfcd 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -10,12 +10,13 @@ export default function GUI({ os }: { os: OS }) { 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 connections would fail to establish if both Client and Gateway were behind symmetric NAT. - + Fixes an issue that caused increased CPU and memory consumption. diff --git a/website/src/components/Changelog/Gateway.tsx b/website/src/components/Changelog/Gateway.tsx index 0eca05189..dff162b7b 100644 --- a/website/src/components/Changelog/Gateway.tsx +++ b/website/src/components/Changelog/Gateway.tsx @@ -22,12 +22,13 @@ export default function Gateway() { return ( - + + Fixes an issue where connections would fail to establish if both Client and Gateway were behind symmetric NAT. - + Fixes an issue where connections failed to establish on machines with