From 4a1dc23a7e8a3f47023201684873f1223004d26a Mon Sep 17 00:00:00 2001 From: Jamil Date: Thu, 19 Sep 2024 07:13:33 -0700 Subject: [PATCH] ci: Bump Apple and GUI versions (#6776) Mainly to get DNS logging improvements out. --- .github/workflows/_tauri.yml | 22 +++++++++---------- .github/workflows/ci.yml | 2 +- rust/Cargo.lock | 6 ++--- rust/connlib/clients/apple/Cargo.toml | 2 +- rust/gui-client/src-common/Cargo.toml | 2 +- rust/gui-client/src-tauri/Cargo.toml | 2 +- scripts/Makefile | 8 +++---- .../apple/Firezone.xcodeproj/project.pbxproj | 12 +++++----- website/src/app/api/releases/route.ts | 4 ++-- website/src/components/Changelog/Apple.tsx | 15 ++++++++----- website/src/components/Changelog/GUI.tsx | 14 +++++++----- 11 files changed, 49 insertions(+), 40 deletions(-) diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index e57dc529c..66d5867ec 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -31,31 +31,31 @@ jobs: include: - runs-on: ubuntu-20.04 # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.3.4_x86_64 + binary-dest-path: firezone-client-gui-linux_1.3.5_x86_64 rename-script: ../../scripts/build/tauri-rename-ubuntu.sh upload-script: ../../scripts/build/tauri-upload-ubuntu.sh # mark:next-gui-version - syms-artifact: rust/gui-client/firezone-client-gui-linux_1.3.4_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.3.5_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.4_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.5_x86_64.deb - runs-on: ubuntu-22.04-arm # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.3.4_aarch64 + binary-dest-path: firezone-client-gui-linux_1.3.5_aarch64 rename-script: ../../scripts/build/tauri-rename-ubuntu.sh upload-script: ../../scripts/build/tauri-upload-ubuntu.sh # mark:next-gui-version - syms-artifact: rust/gui-client/firezone-client-gui-linux_1.3.4_aarch64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.3.5_aarch64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.4_aarch64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.5_aarch64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.3.4_x86_64 + binary-dest-path: firezone-client-gui-windows_1.3.5_x86_64 rename-script: ../../scripts/build/tauri-rename-windows.sh upload-script: ../../scripts/build/tauri-upload-windows.sh # mark:next-gui-version - syms-artifact: rust/gui-client/firezone-client-gui-windows_1.3.4_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.3.5_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.3.4_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.3.5_x86_64.msi env: BINARY_DEST_PATH: ${{ matrix.binary-dest-path }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} @@ -103,7 +103,7 @@ jobs: if: ${{ runner.os == 'Windows' }} shell: bash # mark:next-gui-version - run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.3.4_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.3.5_x64_en-US.msi - name: Rename artifacts and compute SHA256 shell: bash run: ${{ matrix.rename-script }} @@ -128,6 +128,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} # mark:next-gui-version - TAG_NAME: gui-client-1.3.4 + TAG_NAME: gui-client-1.3.5 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62af798f4..bca09162a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,7 +53,7 @@ jobs: - release_name: headless-client-1.3.2 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.3.4 + - release_name: gui-client-1.3.5 config_name: release-drafter-gui-client.yml steps: - uses: release-drafter/release-drafter@v6 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 28a618351..959c96c91 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1035,7 +1035,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.3.3" +version = "1.3.4" dependencies = [ "anyhow", "backoff", @@ -1886,7 +1886,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.3.4" +version = "1.3.5" dependencies = [ "anyhow", "atomicwrites", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "firezone-gui-client-common" -version = "1.3.4" +version = "1.3.5" dependencies = [ "anyhow", "arboard", diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index 57f80a5cd..81db685a8 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.3.3" +version = "1.3.4" edition = "2021" [features] diff --git a/rust/gui-client/src-common/Cargo.toml b/rust/gui-client/src-common/Cargo.toml index 2127e85dd..3c0045b54 100644 --- a/rust/gui-client/src-common/Cargo.toml +++ b/rust/gui-client/src-common/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-gui-client-common" # mark:next-gui-version -version = "1.3.4" +version = "1.3.5" edition = "2021" [dependencies] diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 0dbd3c057..ea43e79f5 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.3.4" +version = "1.3.5" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/scripts/Makefile b/scripts/Makefile index 7cfbe66e8..dcdce6a7c 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -18,17 +18,17 @@ # the relevant versions in order to push to a newly drafted release. # Tracks the current version to use for generating download links and changelogs -current-apple-version = 1.3.2 +current-apple-version = 1.3.3 current-android-version = 1.3.2 current-gateway-version = 1.3.1 -current-gui-version = 1.3.3 +current-gui-version = 1.3.4 current-headless-version = 1.3.1 # Tracks the next version to release for each platform -next-apple-version = 1.3.3 +next-apple-version = 1.3.4 next-android-version = 1.3.3 next-gateway-version = 1.3.2 -next-gui-version = 1.3.4 +next-gui-version = 1.3.5 next-headless-version = 1.3.2 # macOS uses a slightly different sed syntax diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index 30a3d8649..7a7001bd3 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -585,7 +585,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension"; @@ -627,7 +627,7 @@ ); "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release"; MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -671,7 +671,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.3.3; + MARKETING_VERSION = 1.3.4; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -714,7 +714,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.3.3; + MARKETING_VERSION = 1.3.4; OTHER_LDFLAGS = "-lconnlib"; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -908,7 +908,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -959,7 +959,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MARKETING_VERSION = 1.3.3; + MARKETING_VERSION = 1.3.4; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 4d25afc8b..59888d7e1 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -5,11 +5,11 @@ export async function GET(_req: NextRequest) { const versions = { portal: await get("deployed_sha"), // mark:current-apple-version - apple: "1.3.2", + apple: "1.3.3", // mark:current-android-version android: "1.3.2", // mark:current-gui-version - gui: "1.3.3", + gui: "1.3.4", // mark:current-headless-version headless: "1.3.1", // mark:current-gateway-version diff --git a/website/src/components/Changelog/Apple.tsx b/website/src/components/Changelog/Apple.tsx index cdfc0e3c4..1720592b9 100644 --- a/website/src/components/Changelog/Apple.tsx +++ b/website/src/components/Changelog/Apple.tsx @@ -9,17 +9,22 @@ export default function Apple() { href="https://apps.apple.com/us/app/firezone/id6443661826" title="macOS / iOS" > - {/* - +
    - Fixes a bug where DNS PTR queries by the system did not get answered. + Fixes a bug where DNS PTR queries by the system did not get + answered. + - Fixes a routing bug when one of several overlapping CIDR resources gets disabled / removed. + Fixes a routing bug when one of several overlapping CIDR resources + gets disabled / removed. + + + Improves logging for DNS queries when{" "} + firezone_tunnel=trace log level is used.
- */}
    diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index ed08b27b4..60f7b8419 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -13,18 +13,22 @@ export default function GUI({ title }: { title: string }) { return ( {/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This cannot be done when the issue's PR merges. */} - {/* - +
      - Fixes a bug where DNS PTR queries by the system did not get answered. + Fixes a bug where DNS PTR queries by the system did not get + answered. - Fixes a routing bug when one of several overlapping CIDR resources gets disabled / removed. + Fixes a routing bug when one of several overlapping CIDR resources + gets disabled / removed. + + + Improves logging for DNS queries when{" "} + firezone_tunnel=trace log level is used.
    - */}