From 05a046ac1dbe8a0fdd4a21db09fcbab7b74987cc Mon Sep 17 00:00:00 2001 From: Jamil Date: Wed, 12 Jun 2024 22:11:30 -0700 Subject: [PATCH] ci: Bump versions for published releases (#5351) --- .github/workflows/_build_artifacts.yml | 10 +++++----- .github/workflows/_tauri.yml | 18 +++++++++--------- .github/workflows/ci.yml | 6 +++--- .github/workflows/publish.yml | 4 ++-- rust/Cargo.lock | 6 +++--- rust/gateway/Cargo.toml | 2 +- rust/gui-client/src-tauri/Cargo.toml | 2 +- rust/headless-client/Cargo.toml | 2 +- scripts/Makefile | 12 ++++++------ website/redirects.js | 18 +++++++++--------- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index 24bc99f15..4a1197a42 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.7 + version: 1.0.8 # mark:next-headless-version - release_name: headless-client-1.0.7 + release_name: headless-client-1.0.8 - package: firezone-relay artifact: firezone-relay image_name: relay @@ -163,9 +163,9 @@ jobs: artifact: firezone-gateway image_name: gateway # mark:next-gateway-version - version: 1.0.7 + version: 1.0.8 # mark:next-gateway-version - release_name: gateway-1.0.7 + release_name: gateway-1.0.8 - package: snownet-tests artifact: snownet-tests image_name: snownet-tests @@ -342,7 +342,7 @@ jobs: - name: relay - name: gateway # mark:next-gateway-version - version: 1.0.7 + version: 1.0.8 - name: client # mark:next-client-version version: 1.0.6 diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index e6e399e06..808f84aea 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.7_x86_64 + binary-dest-path: firezone-client-gui-linux_1.0.8_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.7_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.0.8_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.7_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.8_x86_64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.0.7_x86_64 + binary-dest-path: firezone-client-gui-windows_1.0.8_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.7_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.0.8_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.7_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.8_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.7 + FIREZONE_PACKAGE_VERSION: 1.0.8 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.7_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.0.8_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.7 + TAG_NAME: gui-client-1.0.8 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc937e4ff..58cf4f7a9 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.0.7 + - release_name: gateway-1.0.8 config_name: release-drafter-gateway.yml # mark:next-headless-version - - release_name: headless-client-1.0.7 + - release_name: headless-client-1.0.8 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.0.7 + - release_name: gui-client-1.0.8 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 51192926d..cf45fe37a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -45,11 +45,11 @@ jobs: if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then image=gateway # mark:next-gateway-version - VERSION="1.0.7" + VERSION="1.0.8" elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then image=client # mark:next-headless-version - VERSION="1.0.7" + VERSION="1.0.8" else echo "Release doesn't require publishing Docker images" exit 0 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3fb26ab47..c60e18d29 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1893,7 +1893,7 @@ dependencies = [ [[package]] name = "firezone-gateway" -version = "1.0.7" +version = "1.0.8" dependencies = [ "anyhow", "async-trait", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.0.7" +version = "1.0.8" dependencies = [ "anyhow", "arboard", @@ -1979,7 +1979,7 @@ dependencies = [ [[package]] name = "firezone-headless-client" -version = "1.0.7" +version = "1.0.8" dependencies = [ "anyhow", "atomicwrites", diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml index e1bc10ab5..818dc3257 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.0.7" +version = "1.0.8" 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 ed3241a6b..e0cbcca58 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.7" +version = "1.0.8" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/rust/headless-client/Cargo.toml b/rust/headless-client/Cargo.toml index 0eec98bd9..31291b631 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.7" +version = "1.0.8" edition = "2021" authors = ["Firezone, Inc."] diff --git a/scripts/Makefile b/scripts/Makefile index a1c237d28..06c155d62 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -15,16 +15,16 @@ # Tracks the current version to use for generating download links and changelogs current-apple-version = 1.0.4 current-android-version = 1.0.3 -current-gateway-version = 1.0.6 -current-gui-version = 1.0.6 -current-headless-version = 1.0.6 +current-gateway-version = 1.0.7 +current-gui-version = 1.0.7 +current-headless-version = 1.0.7 # Tracks the next version to release for each platform next-apple-version = 1.0.5 next-android-version = 1.0.4 -next-gateway-version = 1.0.7 -next-gui-version = 1.0.7 -next-headless-version = 1.0.7 +next-gateway-version = 1.0.8 +next-gui-version = 1.0.8 +next-headless-version = 1.0.8 # macOS uses a slightly different sed syntax ifeq ($(shell uname),Darwin) diff --git a/website/redirects.js b/website/redirects.js index a692feec2..965e0708a 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -11,7 +11,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.0.6/firezone-client-gui-windows_1.0.6_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.7/firezone-client-gui-windows_1.0.7_x86_64.msi", permanent: false, }, // versioned @@ -31,35 +31,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.0.6/firezone-client-gui-linux_1.0.6_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.7/firezone-client-gui-linux_1.0.7_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.0.6/firezone-client-gui-linux_1.0.6_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.7/firezone-client-gui-linux_1.0.7_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.0.6/firezone-client-headless-linux_1.0.6_x86_64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.7/firezone-client-headless-linux_1.0.7_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.0.6/firezone-client-headless-linux_1.0.6_aarch64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.7/firezone-client-headless-linux_1.0.7_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.0.6/firezone-client-headless-linux_1.0.6_armv7", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.7/firezone-client-headless-linux_1.0.7_armv7", permanent: false, }, // versioned @@ -103,21 +103,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.0.6/firezone-gateway_1.0.6_x86_64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.0.7/firezone-gateway_1.0.7_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.0.6/firezone-gateway_1.0.6_aarch64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.0.7/firezone-gateway_1.0.7_aarch64", permanent: false, }, { source: "/dl/firezone-gateway/latest/armv7", destination: // mark:current-gateway-version - "https://www.github.com/firezone/firezone/releases/download/gateway-1.0.6/firezone-gateway_1.0.6_armv7", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.0.7/firezone-gateway_1.0.7_armv7", permanent: false, }, // versioned