diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index 26ed96106..b93af2c28 100644 --- a/.github/workflows/_build_artifacts.yml +++ b/.github/workflows/_build_artifacts.yml @@ -155,9 +155,9 @@ jobs: artifact: firezone-client-headless-linux image_name: client # mark:next-headless-version - release_name: headless-client-1.3.1 + release_name: headless-client-1.3.2 # mark:next-headless-version - version: 1.3.1 + version: 1.3.2 - package: firezone-relay artifact: firezone-relay image_name: relay @@ -165,9 +165,9 @@ jobs: artifact: firezone-gateway image_name: gateway # mark:next-gateway-version - release_name: gateway-1.3.1 + release_name: gateway-1.3.2 # mark:next-gateway-version - version: 1.3.1 + version: 1.3.2 - package: http-test-server artifact: http-test-server image_name: http-test-server @@ -347,7 +347,7 @@ jobs: - name: relay - name: gateway # mark:next-gateway-version - version: 1.3.1 + version: 1.3.2 - name: client # mark:next-client-version version: 1.0.6 diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index 2236fdd85..4af58cfe0 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.3.1_x86_64 + binary-dest-path: firezone-client-gui-linux_1.3.2_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.1_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.3.2_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.1_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.2_x86_64.deb - runs-on: ubuntu-20.04-arm # mark:next-gui-version - binary-dest-path: firezone-client-gui-linux_1.3.1_aarch64 + binary-dest-path: firezone-client-gui-linux_1.3.2_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.1_aarch64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.3.2_aarch64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.1_aarch64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.3.2_aarch64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.3.1_x86_64 + binary-dest-path: firezone-client-gui-windows_1.3.2_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.1_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.3.2_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.3.1_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.3.2_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.3.1_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.3.2_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.3.1 + TAG_NAME: gui-client-1.3.2 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4dcfb3c4..b7c58074c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,13 +47,13 @@ jobs: matrix: include: # mark:next-gateway-version - - release_name: gateway-1.3.1 + - release_name: gateway-1.3.2 config_name: release-drafter-gateway.yml # mark:next-headless-version - - release_name: headless-client-1.3.1 + - release_name: headless-client-1.3.2 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.3.1 + - release_name: gui-client-1.3.2 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 eefaa83d1..b32f0a305 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,11 +38,11 @@ jobs: if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then ARTIFACT=gateway # mark:next-gateway-version - VERSION="1.3.1" + VERSION="1.3.2" elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then ARTIFACT=client # mark:next-headless-version - VERSION="1.3.1" + VERSION="1.3.2" else echo "Shouldn't have gotten here. Exiting." exit 1 diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 73766142b..960e26f33 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.3.1" + versionName = "1.3.2" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 93f2c618c..dff304bca 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1008,7 +1008,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.3.1" +version = "1.3.2" dependencies = [ "android_log-sys", "backoff", @@ -1850,7 +1850,7 @@ dependencies = [ [[package]] name = "firezone-gateway" -version = "1.3.1" +version = "1.3.2" dependencies = [ "anyhow", "async-trait", @@ -1886,7 +1886,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.3.1" +version = "1.3.2" dependencies = [ "anyhow", "atomicwrites", @@ -1925,7 +1925,7 @@ dependencies = [ [[package]] name = "firezone-gui-client-common" -version = "1.3.1" +version = "1.3.2" dependencies = [ "anyhow", "arboard", @@ -1965,7 +1965,7 @@ dependencies = [ [[package]] name = "firezone-headless-client" -version = "1.3.1" +version = "1.3.2" dependencies = [ "anyhow", "atomicwrites", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index 3c2cbbcce..51dbfeddf 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.3.1" +version = "1.3.2" edition = "2021" [lib] diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml index 6bddaf959..44312d7e5 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.3.1" +version = "1.3.2" 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-common/Cargo.toml b/rust/gui-client/src-common/Cargo.toml index 03988a085..ed28219c1 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.1" +version = "1.3.2" edition = "2021" [dependencies] diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index 3e6bd5ed7..475e620bd 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.1" +version = "1.3.2" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/rust/headless-client/Cargo.toml b/rust/headless-client/Cargo.toml index 49a673fa7..e11e82ebd 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.3.1" +version = "1.3.2" 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 fa3680fc0..c41b5fcbe 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -14,17 +14,17 @@ # Tracks the current version to use for generating download links and changelogs current-apple-version = 1.3.0 -current-android-version = 1.3.0 -current-gateway-version = 1.3.0 -current-gui-version = 1.3.0 -current-headless-version = 1.3.0 +current-android-version = 1.3.1 +current-gateway-version = 1.3.1 +current-gui-version = 1.3.1 +current-headless-version = 1.3.1 # Tracks the next version to release for each platform next-apple-version = 1.3.1 -next-android-version = 1.3.1 -next-gateway-version = 1.3.1 -next-gui-version = 1.3.1 -next-headless-version = 1.3.1 +next-android-version = 1.3.2 +next-gateway-version = 1.3.2 +next-gui-version = 1.3.2 +next-headless-version = 1.3.2 # macOS uses a slightly different sed syntax ifeq ($(shell uname),Darwin) diff --git a/website/redirects.js b/website/redirects.js index 5dd9ddc82..51d07f0b3 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.3.0/firezone-client-gui-windows_1.3.0_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.3.1/firezone-client-gui-windows_1.3.1_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.3.0/firezone-client-gui-linux_1.3.0_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.3.1/firezone-client-gui-linux_1.3.1_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.3.0/firezone-client-gui-linux_1.3.0_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.3.1/firezone-client-gui-linux_1.3.1_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.3.0/firezone-client-headless-linux_1.3.0_x86_64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.1/firezone-client-headless-linux_1.3.1_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.3.0/firezone-client-headless-linux_1.3.0_aarch64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.1/firezone-client-headless-linux_1.3.1_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.3.0/firezone-client-headless-linux_1.3.0_armv7", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.3.1/firezone-client-headless-linux_1.3.1_armv7", permanent: false, }, /* @@ -62,21 +62,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.3.0/firezone-gateway_1.3.0_x86_64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.3.1/firezone-gateway_1.3.1_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.3.0/firezone-gateway_1.3.0_aarch64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.3.1/firezone-gateway_1.3.1_aarch64", permanent: false, }, { source: "/dl/firezone-gateway/latest/armv7", destination: // mark:current-gateway-version - "https://www.github.com/firezone/firezone/releases/download/gateway-1.3.0/firezone-gateway_1.3.0_armv7", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.3.1/firezone-gateway_1.3.1_armv7", permanent: false, }, /* diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index 0450d5e98..cc2175bff 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -13,7 +13,7 @@ export default function Android() {