diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index fab51a25e..41330ccc0 100644 --- a/.github/workflows/_build_artifacts.yml +++ b/.github/workflows/_build_artifacts.yml @@ -156,9 +156,9 @@ jobs: artifact: firezone-client-headless-linux image_name: client # mark:next-headless-version - release_name: headless-client-1.1.5 + release_name: headless-client-1.2.0 # mark:next-headless-version - version: 1.1.5 + version: 1.2.0 - package: firezone-relay artifact: firezone-relay image_name: relay @@ -166,9 +166,9 @@ jobs: artifact: firezone-gateway image_name: gateway # mark:next-gateway-version - release_name: gateway-1.1.4 + release_name: gateway-1.2.0 # mark:next-gateway-version - version: 1.1.4 + version: 1.2.0 - package: snownet-tests artifact: snownet-tests image_name: snownet-tests @@ -352,7 +352,7 @@ jobs: - name: relay - name: gateway # mark:next-gateway-version - version: 1.1.4 + version: 1.2.0 - name: client # mark:next-client-version version: 1.0.6 diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index b34036635..f6aa93019 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -26,31 +26,31 @@ jobs: include: - runs-on: ubuntu-20.04 # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.1.10_x86_64 + binary-dest-path: firezone-client-gui-linux_1.2.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.1.10_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.2.0_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.10_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.2.0_x86_64.deb - runs-on: ubuntu-20.04-arm # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.1.10_aarch64 + binary-dest-path: firezone-client-gui-linux_1.2.0_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.1.10_aarch64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.2.0_aarch64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.10_aarch64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.2.0_aarch64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.1.10_x86_64 + binary-dest-path: firezone-client-gui-windows_1.2.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.1.10_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.2.0_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.10_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.2.0_x86_64.msi env: BINARY_DEST_PATH: ${{ matrix.binary-dest-path }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} @@ -96,7 +96,7 @@ jobs: if: ${{ runner.os == 'Windows' }} shell: bash # mark:next-gui-version - run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.10_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.2.0_x64_en-US.msi - name: Rename artifacts and compute SHA256 shell: bash run: ${{ matrix.rename-script }} @@ -121,6 +121,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} # mark:next-gui-version - TAG_NAME: gui-client-1.1.10 + TAG_NAME: gui-client-1.2.0 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b32c18dc2..eee6f14f8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,13 +46,13 @@ jobs: matrix: include: # mark:next-gateway-version - - release_name: gateway-1.1.4 + - release_name: gateway-1.2.0 config_name: release-drafter-gateway.yml # mark:next-headless-version - - release_name: headless-client-1.1.5 + - release_name: headless-client-1.2.0 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.1.10 + - release_name: gui-client-1.2.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 8e5a78843..bf105f57c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -40,11 +40,11 @@ jobs: if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then ARTIFACT=gateway # mark:next-gateway-version - VERSION="1.1.4" + VERSION="1.2.0" elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then ARTIFACT=client # mark:next-headless-version - VERSION="1.1.5" + VERSION="1.2.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 bc1d7f82b..7087e779e 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -56,7 +56,7 @@ android { targetSdk = 35 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.1.5" + versionName = "1.2.0" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index ec9f6dc62..4b37d392f 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -990,7 +990,7 @@ dependencies = [ [[package]] name = "connlib-client-android" -version = "1.1.5" +version = "1.2.0" dependencies = [ "android_log-sys", "backoff", @@ -1015,7 +1015,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.1.4" +version = "1.2.0" dependencies = [ "anyhow", "backoff", @@ -1800,7 +1800,7 @@ dependencies = [ [[package]] name = "firezone-gateway" -version = "1.1.4" +version = "1.2.0" dependencies = [ "anyhow", "async-trait", @@ -1836,7 +1836,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.1.10" +version = "1.2.0" dependencies = [ "anyhow", "arboard", @@ -1888,7 +1888,7 @@ dependencies = [ [[package]] name = "firezone-headless-client" -version = "1.1.5" +version = "1.2.0" dependencies = [ "anyhow", "atomicwrites", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index a51601bbb..c1a2880f8 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.1.5" +version = "1.2.0" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index e085ad16c..dc2fb4ff9 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.1.4" +version = "1.2.0" edition = "2021" [features] diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml index e49d97cc0..9cac7f9c7 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.1.4" +version = "1.2.0" edition = "2021" # 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 1b48e5dd1..50e48e54b 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.1.10" +version = "1.2.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 d95f16b87..4284f3145 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.1.5" +version = "1.2.0" edition = "2021" authors = ["Firezone, Inc."] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/scripts/Makefile b/scripts/Makefile index b5ecebc36..cf5968859 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -16,15 +16,15 @@ current-apple-version = 1.1.3 current-android-version = 1.1.4 current-gateway-version = 1.1.3 -current-gui-version = 1.1.9 -current-headless-version = 1.1.4 +current-gui-version = 1.1.10 +current-headless-version = 1.1.5 # Tracks the next version to release for each platform -next-apple-version = 1.1.4 -next-android-version = 1.1.5 -next-gateway-version = 1.1.4 -next-gui-version = 1.1.10 -next-headless-version = 1.1.5 +next-apple-version = 1.2.0 +next-android-version = 1.2.0 +next-gateway-version = 1.2.0 +next-gui-version = 1.2.0 +next-headless-version = 1.2.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 c2925c46d..7d19d97d3 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.1.4; + MARKETING_VERSION = 1.2.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.1.4; + MARKETING_VERSION = 1.2.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.1.4; + MARKETING_VERSION = 1.2.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.1.4; + MARKETING_VERSION = 1.2.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.1.4; + MARKETING_VERSION = 1.2.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.1.4; + MARKETING_VERSION = 1.2.0; 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 8f599662a..6832a5f0a 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -10,7 +10,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.1.9/firezone-client-gui-windows_1.1.9_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.10/firezone-client-gui-windows_1.1.10_x86_64.msi", permanent: false, }, /* @@ -22,35 +22,35 @@ 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.1.9/firezone-client-gui-linux_1.1.9_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.10/firezone-client-gui-linux_1.1.10_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.1.9/firezone-client-gui-linux_1.1.9_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.10/firezone-client-gui-linux_1.1.10_aarch64.deb", permanent: false, }, { source: "/dl/firezone-client-headless-linux/latest/x86_64", destination: // mark:current-headless-version - "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.4/firezone-client-headless-linux_1.1.4_x86_64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.5/firezone-client-headless-linux_1.1.5_x86_64", permanent: false, }, { source: "/dl/firezone-client-headless-linux/latest/aarch64", destination: // mark:current-headless-version - "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.4/firezone-client-headless-linux_1.1.4_aarch64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.5/firezone-client-headless-linux_1.1.5_aarch64", permanent: false, }, { source: "/dl/firezone-client-headless-linux/latest/armv7", destination: // mark:current-headless-version - "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.4/firezone-client-headless-linux_1.1.4_armv7", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.5/firezone-client-headless-linux_1.1.5_armv7", permanent: false, }, /* diff --git a/website/src/components/Changelog/GUI.tsx b/website/src/components/Changelog/GUI.tsx index 393076e8b..c89015b42 100644 --- a/website/src/components/Changelog/GUI.tsx +++ b/website/src/components/Changelog/GUI.tsx @@ -13,23 +13,30 @@ export default function GUI({ title }: { title: string }) { return ( {/* - + +
    + TODO +
+ + */} +
    Adds the ability to mark Resources as favorites. - Supports using `etc-resolv-conf` DNS control method, or disabling DNS control + Supports using `etc-resolv-conf` DNS control method, or disabling + DNS control Supports disabling DNS control - Mitigates a bug where the IPC service can panic if an internal channel fills up + Mitigates a bug where the IPC service can panic if an internal + channel fills up
- */}
    diff --git a/website/src/components/Changelog/Headless.tsx b/website/src/components/Changelog/Headless.tsx index e72157c29..d75915c46 100644 --- a/website/src/components/Changelog/Headless.tsx +++ b/website/src/components/Changelog/Headless.tsx @@ -10,17 +10,23 @@ export default function Headless() { return ( {/* - + +
      + TODO +
    +     + */} +
      Uses `systemd-resolved` DNS control by default on Linux - Mitigates a bug where the Client can panic if an internal channel fills up + Mitigates a bug where the Client can panic if an internal channel + fills up
    - */}