github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Revert bumps to 1.2 (#6227)

Browse Source 
We need these at 1.1 until ready to release.
This commit is contained in:
Jamil
2024-08-08 18:34:39 -07:00
committed by GitHub
parent d315b14b2f
commit a6ba9868dd
13 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/_build_artifacts.yml vendored
View File

@@ -156,9 +156,9 @@ jobs:
artifact: firezone-client-headless-linux
image_name: client
# mark:next-headless-version
release_name: headless-client-1.2.0
release_name: headless-client-1.1.6
# mark:next-headless-version
version: 1.2.0
version: 1.1.6
- 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.2.0
release_name: gateway-1.1.4
# mark:next-gateway-version
version: 1.2.0
version: 1.1.4
- 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.2.0
version: 1.1.4
- name: client
# mark:next-client-version
version: 1.0.6

22
.github/workflows/_tauri.yml vendored
View File

@@ -26,31 +26,31 @@ jobs:
include:
- runs-on: ubuntu-20.04
# mark:next-gui-version
binary-dest-path: firezone-client-gui-linux_1.2.0_x86_64
binary-dest-path: firezone-client-gui-linux_1.1.11_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.2.0_x86_64.dwp
syms-artifact: rust/gui-client/firezone-client-gui-linux_1.1.11_x86_64.dwp
# mark:next-gui-version
pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.2.0_x86_64.deb
pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.11_x86_64.deb
- runs-on: ubuntu-20.04-arm
# mark:next-gui-version
binary-dest-path: firezone-client-gui-linux_1.2.0_aarch64
binary-dest-path: firezone-client-gui-linux_1.1.11_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.2.0_aarch64.dwp
syms-artifact: rust/gui-client/firezone-client-gui-linux_1.1.11_aarch64.dwp
# mark:next-gui-version
pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.2.0_aarch64.deb
pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.1.11_aarch64.deb
- runs-on: windows-2019
# mark:next-gui-version
binary-dest-path: firezone-client-gui-windows_1.2.0_x86_64
binary-dest-path: firezone-client-gui-windows_1.1.11_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.2.0_x86_64.pdb
syms-artifact: rust/gui-client/firezone-client-gui-windows_1.1.11_x86_64.pdb
# mark:next-gui-version
pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.2.0_x86_64.msi
pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.1.11_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.2.0_x64_en-US.msi
run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.1.11_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.2.0
TAG_NAME: gui-client-1.1.11
shell: bash
run: ${{ matrix.upload-script }}

6
.github/workflows/ci.yml vendored
View File

@@ -46,13 +46,13 @@ jobs:
matrix:
include:
# mark:next-gateway-version
- release_name: gateway-1.2.0
- release_name: gateway-1.1.4
config_name: release-drafter-gateway.yml
# mark:next-headless-version
- release_name: headless-client-1.2.0
- release_name: headless-client-1.1.6
config_name: release-drafter-headless-client.yml
# mark:next-gui-version
- release_name: gui-client-1.2.0
- release_name: gui-client-1.1.11
config_name: release-drafter-gui-client.yml
steps:
- uses: release-drafter/release-drafter@v6

4
.github/workflows/publish.yml vendored
View File

@@ -40,11 +40,11 @@ jobs:
if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then
ARTIFACT=gateway
# mark:next-gateway-version
VERSION="1.2.0"
VERSION="1.1.4"
elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then
ARTIFACT=client
# mark:next-headless-version
VERSION="1.2.0"
VERSION="1.1.6"
else
echo "Release doesn't require publishing Docker images"
exit 0

2
kotlin/android/app/build.gradle.kts
View File

@@ -56,7 +56,7 @@ android {
targetSdk = 35
versionCode = (System.currentTimeMillis() / 1000 / 10).toInt()
// mark:next-android-version
versionName = "1.2.0"
versionName = "1.1.5"
multiDexEnabled = true
testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner"
}

10
rust/Cargo.lock generated
View File

@@ -990,7 +990,7 @@ dependencies = [
[[package]]
name = "connlib-client-android"
version = "1.2.0"
version = "1.1.5"
dependencies = [
"android_log-sys",
"backoff",
@@ -1015,7 +1015,7 @@ dependencies = [
[[package]]
name = "connlib-client-apple"
version = "1.2.0"
version = "1.1.4"
dependencies = [
"anyhow",
"backoff",
@@ -1800,7 +1800,7 @@ dependencies = [
[[package]]
name = "firezone-gateway"
version = "1.2.0"
version = "1.1.4"
dependencies = [
"anyhow",
"async-trait",
@@ -1836,7 +1836,7 @@ dependencies = [
[[package]]
name = "firezone-gui-client"
version = "1.2.0"
version = "1.1.11"
dependencies = [
"anyhow",
"arboard",
@@ -1888,7 +1888,7 @@ dependencies = [
[[package]]
name = "firezone-headless-client"
version = "1.2.0"
version = "1.1.6"
dependencies = [
"anyhow",
"atomicwrites",

2
rust/connlib/clients/android/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-android"
# mark:next-android-version
version = "1.2.0"
version = "1.1.5"
edition = "2021"
[lib]

2
rust/connlib/clients/apple/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-apple"
# mark:next-apple-version
version = "1.2.0"
version = "1.1.4"
edition = "2021"
[features]

2
rust/gateway/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gateway"
# mark:next-gateway-version
version = "1.2.0"
version = "1.1.4"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/gui-client/src-tauri/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gui-client"
# mark:next-gui-version
version = "1.2.0"
version = "1.1.11"
description = "Firezone"
edition = "2021"
default-run = "firezone-gui-client"

2
rust/headless-client/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-headless-client"
# mark:next-headless-version
version = "1.2.0"
version = "1.1.6"
edition = "2021"
authors = ["Firezone, Inc."]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

10
scripts/Makefile
View File

@@ -20,11 +20,11 @@ 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.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
next-apple-version = 1.1.4
next-android-version = 1.1.5
next-gateway-version = 1.1.4
next-gui-version = 1.1.11
next-headless-version = 1.1.6
# macOS uses a slightly different sed syntax
ifeq ($(shell uname),Darwin)

12
swift/apple/Firezone.xcodeproj/project.pbxproj
View File

@@ -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.2.0;
MARKETING_VERSION = 1.1.4;
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.2.0;
MARKETING_VERSION = 1.1.4;
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.2.0;
MARKETING_VERSION = 1.1.4;
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.2.0;
MARKETING_VERSION = 1.1.4;
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.2.0;
MARKETING_VERSION = 1.1.4;
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.2.0;
MARKETING_VERSION = 1.1.4;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
PRODUCT_NAME = "$(TARGET_NAME)";