From b4cde74beecf5da88d269f59e4150dfedf2f52ee Mon Sep 17 00:00:00 2001 From: Jamil Date: Fri, 21 Jun 2024 09:31:43 -0700 Subject: [PATCH] chore: Bump client next versions to 1.1.0 (#5485) --- .github/workflows/_build_artifacts.yml | 4 ++-- .github/workflows/_kotlin.yml | 2 +- .github/workflows/_swift.yml | 2 +- .github/workflows/_tauri.yml | 18 +++++++++--------- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish.yml | 2 +- kotlin/android/app/build.gradle.kts | 2 +- rust/Cargo.lock | 8 ++++---- rust/connlib/clients/android/Cargo.toml | 2 +- rust/connlib/clients/apple/Cargo.toml | 2 +- rust/gui-client/src-tauri/Cargo.toml | 2 +- rust/headless-client/Cargo.toml | 2 +- scripts/Makefile | 8 ++++---- swift/apple/Firezone.xcodeproj/project.pbxproj | 12 ++++++------ 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index adb408e42..ada41f0a7 100644 --- a/.github/workflows/_build_artifacts.yml +++ b/.github/workflows/_build_artifacts.yml @@ -153,9 +153,9 @@ jobs: artifact: firezone-client-headless-linux image_name: client # mark:next-headless-version - version: 1.0.9 + version: 1.1.0 # mark:next-headless-version - release_name: headless-client-1.0.9 + release_name: headless-client-1.1.0 - package: firezone-relay artifact: firezone-relay image_name: relay diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index 4a67d07f8..e04bed0d3 100644 --- a/.github/workflows/_kotlin.yml +++ b/.github/workflows/_kotlin.yml @@ -51,7 +51,7 @@ jobs: - name: Bundle and sign release env: # mark:next-android-version - FIREZONE_PACKAGE_VERSION: 1.0.5 + FIREZONE_PACKAGE_VERSION: 1.1.0 KEYSTORE_BASE64: ${{ secrets.GOOGLE_UPLOAD_KEYSTORE_BASE64 }} KEYSTORE_PASSWORD: ${{ secrets.GOOGLE_UPLOAD_KEYSTORE_PASSWORD }} KEYSTORE_KEY_PASSWORD: ${{ secrets.GOOGLE_UPLOAD_KEYSTORE_KEY_PASSWORD }} diff --git a/.github/workflows/_swift.yml b/.github/workflows/_swift.yml index 7b5c002c3..2ca99444e 100644 --- a/.github/workflows/_swift.yml +++ b/.github/workflows/_swift.yml @@ -96,7 +96,7 @@ jobs: # Needed because `productbuild` doesn't support picking this up automatically like Xcode does INSTALLER_CODE_SIGN_IDENTITY: "3rd Party Mac Developer Installer: Firezone, Inc. (47R2M6779T)" # mark:next-apple-version - FIREZONE_PACKAGE_VERSION: 1.0.6 + FIREZONE_PACKAGE_VERSION: 1.1.0 run: | # Use the same Xcode version as development sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index eabc6ce36..859aaa270 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -26,22 +26,22 @@ jobs: include: - runs-on: ubuntu-20.04 # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.0.10_x86_64 + binary-dest-path: firezone-client-gui-linux_1.1.0_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.0.10_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.1.0_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.10_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.0_x86_64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.0.10_x86_64 + binary-dest-path: firezone-client-gui-windows_1.1.0_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.0.10_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.1.0_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.10_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.0_x86_64.msi env: BINARY_DEST_PATH: ${{ matrix.binary-dest-path }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} @@ -50,7 +50,7 @@ jobs: AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_CERT_NAME: ${{ secrets.AZURE_CERT_NAME }} # mark:next-gui-version - FIREZONE_PACKAGE_VERSION: 1.0.10 + FIREZONE_PACKAGE_VERSION: 1.1.0 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup-node @@ -80,7 +80,7 @@ jobs: if: ${{ runner.os == 'Windows' }} shell: bash # mark:next-gui-version - run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.0.10_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.0_x64_en-US.msi - name: Rename artifacts and compute SHA256 shell: bash run: ${{ matrix.rename-script }} @@ -105,6 +105,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} # mark:next-gui-version - TAG_NAME: gui-client-1.0.10 + TAG_NAME: gui-client-1.1.0 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f782b4984..3d0dd19c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,10 +49,10 @@ jobs: - release_name: gateway-1.1.1 config_name: release-drafter-gateway.yml # mark:next-headless-version - - release_name: headless-client-1.0.9 + - release_name: headless-client-1.1.0 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.0.10 + - release_name: gui-client-1.1.0 config_name: release-drafter-gui-client.yml steps: - uses: release-drafter/release-drafter@v6 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 098291685..2da78c2b0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -44,7 +44,7 @@ jobs: elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then ARTIFACT=client # mark:next-headless-version - VERSION="1.0.9" + VERSION="1.1.0" else echo "Release doesn't require publishing Docker images" exit 0 diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 79cf36188..1fc6dbd77 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -56,7 +56,7 @@ android { targetSdk = 34 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.0.5" + versionName = "1.1.0" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 99b0e84b0..a6c269b11 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1105,7 +1105,7 @@ dependencies = [ [[package]] name = "connlib-client-android" -version = "1.0.5" +version = "1.1.0" dependencies = [ "connlib-client-shared", "ip_network", @@ -1124,7 +1124,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.0.6" +version = "1.1.0" dependencies = [ "connlib-client-shared", "ip_network", @@ -1928,7 +1928,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.0.10" +version = "1.1.0" dependencies = [ "anyhow", "arboard", @@ -1981,7 +1981,7 @@ dependencies = [ [[package]] name = "firezone-headless-client" -version = "1.0.9" +version = "1.1.0" dependencies = [ "anyhow", "atomicwrites", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index fffa3aa80..b66ad91a6 100644 --- a/rust/connlib/clients/android/Cargo.toml +++ b/rust/connlib/clients/android/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-android" # mark:next-android-version -version = "1.0.5" +version = "1.1.0" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index f95010784..cc0128531 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.0.6" +version = "1.1.0" edition = "2021" [features] diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 536efa41d..c335bf6e0 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.0.10" +version = "1.1.0" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/rust/headless-client/Cargo.toml b/rust/headless-client/Cargo.toml index 0052df209..d54383de2 100644 --- a/rust/headless-client/Cargo.toml +++ b/rust/headless-client/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-headless-client" # mark:next-headless-version -version = "1.0.9" +version = "1.1.0" edition = "2021" authors = ["Firezone, Inc."] diff --git a/scripts/Makefile b/scripts/Makefile index 0848acb93..0458285bf 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -20,11 +20,11 @@ current-gui-version = 1.0.9 current-headless-version = 1.0.8 # Tracks the next version to release for each platform -next-apple-version = 1.0.6 -next-android-version = 1.0.5 +next-apple-version = 1.1.0 +next-android-version = 1.1.0 next-gateway-version = 1.1.1 -next-gui-version = 1.0.10 -next-headless-version = 1.0.9 +next-gui-version = 1.1.0 +next-headless-version = 1.1.0 # macOS uses a slightly different sed syntax ifeq ($(shell uname),Darwin) diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index 20d8c3165..811801edd 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.0.6; + MARKETING_VERSION = 1.1.0; 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.0.6; + MARKETING_VERSION = 1.1.0; 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.0.6; + MARKETING_VERSION = 1.1.0; 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.0.6; + MARKETING_VERSION = 1.1.0; 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.0.6; + MARKETING_VERSION = 1.1.0; 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.0.6; + MARKETING_VERSION = 1.1.0; PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)"; PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)"; PRODUCT_NAME = "$(TARGET_NAME)";