diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index bd997ac99..23abb10e5 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 - release_name: headless-client-1.1.1 + release_name: headless-client-1.1.2 # mark:next-headless-version - version: 1.1.1 + version: 1.1.2 - package: firezone-relay artifact: firezone-relay image_name: relay @@ -163,9 +163,9 @@ jobs: artifact: firezone-gateway image_name: gateway # mark:next-gateway-version - release_name: gateway-1.1.2 + release_name: gateway-1.1.3 # mark:next-gateway-version - version: 1.1.2 + version: 1.1.3 - package: snownet-tests artifact: snownet-tests image_name: snownet-tests @@ -348,7 +348,7 @@ jobs: - name: relay - name: gateway # mark:next-gateway-version - version: 1.1.2 + version: 1.1.3 - name: client # mark:next-client-version version: 1.0.6 diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index ec85d89e4..4277db269 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.1.2_x86_64 + binary-dest-path: firezone-client-gui-linux_1.1.3_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.2_x86_64.dwp + syms-artifact: rust/gui-client/firezone-client-gui-linux_1.1.3_x86_64.dwp # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.2_x86_64.deb + pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.3_x86_64.deb - runs-on: windows-2019 # mark:next-gui-version - binary-dest-path: firezone-client-gui-windows_1.1.2_x86_64 + binary-dest-path: firezone-client-gui-windows_1.1.3_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.2_x86_64.pdb + syms-artifact: rust/gui-client/firezone-client-gui-windows_1.1.3_x86_64.pdb # mark:next-gui-version - pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.2_x86_64.msi + pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.3_x86_64.msi env: BINARY_DEST_PATH: ${{ matrix.binary-dest-path }} AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }} @@ -74,7 +74,7 @@ jobs: if: ${{ runner.os == 'Windows' }} shell: bash # mark:next-gui-version - run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.2_x64_en-US.msi + run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.3_x64_en-US.msi - name: Rename artifacts and compute SHA256 shell: bash run: ${{ matrix.rename-script }} @@ -99,6 +99,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} # mark:next-gui-version - TAG_NAME: gui-client-1.1.2 + TAG_NAME: gui-client-1.1.3 shell: bash run: ${{ matrix.upload-script }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f06da1ad6..3e44f0fb6 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.2 + - release_name: gateway-1.1.3 config_name: release-drafter-gateway.yml # mark:next-headless-version - - release_name: headless-client-1.1.1 + - release_name: headless-client-1.1.2 config_name: release-drafter-headless-client.yml # mark:next-gui-version - - release_name: gui-client-1.1.2 + - release_name: gui-client-1.1.3 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 46baf7eac..191601c7a 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.2" + VERSION="1.1.3" elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then ARTIFACT=client # mark:next-headless-version - VERSION="1.1.1" + VERSION="1.1.2" 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 a091064fa..40a2aa0ed 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.1.1" + versionName = "1.1.2" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index a7ea67fff..04a2153ff 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1063,7 +1063,7 @@ dependencies = [ [[package]] name = "connlib-client-android" -version = "1.1.1" +version = "1.1.2" dependencies = [ "android_log-sys", "connlib-client-shared", @@ -1082,7 +1082,7 @@ dependencies = [ [[package]] name = "connlib-client-apple" -version = "1.1.1" +version = "1.1.2" dependencies = [ "connlib-client-shared", "ip_network", @@ -1849,7 +1849,7 @@ dependencies = [ [[package]] name = "firezone-gateway" -version = "1.1.2" +version = "1.1.3" dependencies = [ "anyhow", "async-trait", @@ -1884,7 +1884,7 @@ dependencies = [ [[package]] name = "firezone-gui-client" -version = "1.1.2" +version = "1.1.3" dependencies = [ "anyhow", "arboard", @@ -1937,7 +1937,7 @@ dependencies = [ [[package]] name = "firezone-headless-client" -version = "1.1.1" +version = "1.1.2" dependencies = [ "anyhow", "atomicwrites", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index d2308163e..e88613f19 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.1" +version = "1.1.2" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index 969373cf2..763b1ea08 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.1" +version = "1.1.2" edition = "2021" [features] diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml index 8a3fb2ced..133c6635f 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.2" +version = "1.1.3" 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 893b3b094..b863c3075 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.2" +version = "1.1.3" description = "Firezone" edition = "2021" default-run = "firezone-gui-client" diff --git a/rust/headless-client/Cargo.toml b/rust/headless-client/Cargo.toml index 0839ea5fe..fe4265e50 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.1" +version = "1.1.2" edition = "2021" authors = ["Firezone, Inc."] diff --git a/scripts/Makefile b/scripts/Makefile index 04b210ff5..580aea828 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -13,18 +13,18 @@ # 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.1.0 -current-android-version = 1.1.0 -current-gateway-version = 1.1.1 -current-gui-version = 1.1.1 -current-headless-version = 1.1.0 +current-apple-version = 1.1.1 +current-android-version = 1.1.1 +current-gateway-version = 1.1.2 +current-gui-version = 1.1.2 +current-headless-version = 1.1.1 # Tracks the next version to release for each platform -next-apple-version = 1.1.1 -next-android-version = 1.1.1 -next-gateway-version = 1.1.2 -next-gui-version = 1.1.2 -next-headless-version = 1.1.1 +next-apple-version = 1.1.2 +next-android-version = 1.1.2 +next-gateway-version = 1.1.3 +next-gui-version = 1.1.3 +next-headless-version = 1.1.2 # 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 3c4d1e1c4..a1554a039 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.1; + MARKETING_VERSION = 1.1.2; 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.1; + MARKETING_VERSION = 1.1.2; 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.1; + MARKETING_VERSION = 1.1.2; 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.1; + MARKETING_VERSION = 1.1.2; 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.1; + MARKETING_VERSION = 1.1.2; 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.1; + MARKETING_VERSION = 1.1.2; 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 d3644b876..c4d52cab5 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.1/firezone-client-gui-windows_1.1.1_x86_64.msi", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.2/firezone-client-gui-windows_1.1.2_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.1/firezone-client-gui-linux_1.1.1_x86_64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.2/firezone-client-gui-linux_1.1.2_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.1/firezone-client-gui-linux_1.1.1_aarch64.deb", + "https://www.github.com/firezone/firezone/releases/download/gui-client-1.1.2/firezone-client-gui-linux_1.1.2_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.0/firezone-client-headless-linux_1.1.0_x86_64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.1/firezone-client-headless-linux_1.1.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.1.0/firezone-client-headless-linux_1.1.0_aarch64", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.1/firezone-client-headless-linux_1.1.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.1.0/firezone-client-headless-linux_1.1.0_armv7", + "https://www.github.com/firezone/firezone/releases/download/headless-client-1.1.1/firezone-client-headless-linux_1.1.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.1.1/firezone-gateway_1.1.1_x86_64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.1.2/firezone-gateway_1.1.2_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.1.1/firezone-gateway_1.1.1_aarch64", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.1.2/firezone-gateway_1.1.2_aarch64", permanent: false, }, { source: "/dl/firezone-gateway/latest/armv7", destination: // mark:current-gateway-version - "https://www.github.com/firezone/firezone/releases/download/gateway-1.1.1/firezone-gateway_1.1.1_armv7", + "https://www.github.com/firezone/firezone/releases/download/gateway-1.1.2/firezone-gateway_1.1.2_armv7", permanent: false, }, ]; diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index 04677f4e2..3ced16102 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -7,6 +7,17 @@ export default function Android() { href="https://play.google.com/store/apps/details?id=dev.firezone.android" title="Android" > + + +