chore: release Apple & Gateway with ECN fix (#9013)

This commit is contained in:
Jamil
2025-05-02 00:16:40 -07:00
committed by GitHub
parent 513e0a400c
commit 6e0e7343ba
11 changed files with 30 additions and 30 deletions

View File

@@ -236,9 +236,9 @@ jobs:
artifact: firezone-gateway
image_name: gateway
# mark:next-gateway-version
release_name: gateway-1.4.8
release_name: gateway-1.4.9
# mark:next-gateway-version
version: 1.4.8
version: 1.4.9
- package: http-test-server
artifact: http-test-server
image_name: http-test-server
@@ -410,7 +410,7 @@ jobs:
- name: relay
- name: gateway
# mark:next-gateway-version
version: 1.4.8
version: 1.4.9
- name: client
# mark:next-client-version
version: 1.0.6

View File

@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
env:
# mark:next-apple-version
RELEASE_NAME: macos-client-1.4.14
RELEASE_NAME: macos-client-1.4.15
steps:
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}"
@@ -53,11 +53,11 @@ jobs:
build-script: scripts/build/macos-standalone.sh
upload-script: scripts/upload/github-release.sh
# mark:next-apple-version
artifact-file: "firezone-macos-client-1.4.14.dmg"
artifact-file: "firezone-macos-client-1.4.15.dmg"
# mark:next-apple-version
pkg-artifact-file: "firezone-macos-client-1.4.14.pkg"
pkg-artifact-file: "firezone-macos-client-1.4.15.pkg"
# mark:next-apple-version
release-name: macos-client-1.4.14
release-name: macos-client-1.4.15
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:

View File

@@ -47,7 +47,7 @@ jobs:
matrix:
include:
# mark:next-gateway-version
- release_name: gateway-1.4.8
- release_name: gateway-1.4.9
config_name: release-drafter-gateway.yml
# mark:next-headless-version
- release_name: headless-client-1.4.8

View File

@@ -38,7 +38,7 @@ jobs:
if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then
ARTIFACT=gateway
# mark:next-gateway-version
VERSION="1.4.8"
VERSION="1.4.9"
elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then
ARTIFACT=client
# mark:next-headless-version

4
rust/Cargo.lock generated
View File

@@ -1234,7 +1234,7 @@ dependencies = [
[[package]]
name = "connlib-client-apple"
version = "1.4.14"
version = "1.4.15"
dependencies = [
"anyhow",
"backoff",
@@ -2209,7 +2209,7 @@ dependencies = [
[[package]]
name = "firezone-gateway"
version = "1.4.8"
version = "1.4.9"
dependencies = [
"anyhow",
"async-trait",

View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-apple"
# mark:next-apple-version
version = "1.4.14"
version = "1.4.15"
edition = { workspace = true }
license = { workspace = true }

View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gateway"
# mark:next-gateway-version
version = "1.4.8"
version = "1.4.9"
edition = { workspace = true }
license = { workspace = true }
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@@ -46,8 +46,8 @@ function cargo_update_workspace() {
# 7. Commit the changes and open a PR. Ensure the Changelog is correctly
# updated with the changes.
function apple() {
current_apple_version="1.4.13"
next_apple_version="1.4.14"
current_apple_version="1.4.14"
next_apple_version="1.4.15"
find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_apple_version}"'/g;}' {} \;
find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_apple_version}"'/g;}' {} \;
@@ -154,8 +154,8 @@ function headless() {
# 4. Commit the changes and open a PR. Ensure the Changelog is correctly
# updated with the changes.
function gateway() {
current_gateway_version="1.4.7"
next_gateway_version="1.4.8"
current_gateway_version="1.4.8"
next_gateway_version="1.4.9"
find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-gateway-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gateway_version}"'/g;}' {} \;
find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-gateway-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gateway_version}"'/g;}' {} \;

View File

@@ -545,7 +545,7 @@
);
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.4.14;
MARKETING_VERSION = 1.4.15;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension";
@@ -587,7 +587,7 @@
);
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.4.14;
MARKETING_VERSION = 1.4.15;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension";
PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)";
@@ -628,7 +628,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.4.14;
MARKETING_VERSION = 1.4.15;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension";
PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)";
@@ -666,7 +666,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.4.14;
MARKETING_VERSION = 1.4.15;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension";
PRODUCT_NAME = "$(PRODUCT_BUNDLE_IDENTIFIER)";
@@ -838,7 +838,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.4.14;
MARKETING_VERSION = 1.4.15;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -888,7 +888,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 12.4;
MARKETING_VERSION = 1.4.14;
MARKETING_VERSION = 1.4.15;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
PRODUCT_NAME = "$(TARGET_NAME)";

View File

@@ -10,14 +10,14 @@ module.exports = [
source: "/dl/firezone-client-macos/latest",
destination:
// mark:current-apple-version
"https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.13/firezone-macos-client-1.4.13.dmg",
"https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.14/firezone-macos-client-1.4.14.dmg",
permanent: false,
},
{
source: "/dl/firezone-client-macos/pkg/latest",
destination:
// mark:current-apple-version
"https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.13/firezone-macos-client-1.4.13.pkg",
"https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.14/firezone-macos-client-1.4.14.pkg",
permanent: false,
},
/*
@@ -105,21 +105,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.4.7/firezone-gateway_1.4.7_x86_64",
"https://www.github.com/firezone/firezone/releases/download/gateway-1.4.8/firezone-gateway_1.4.8_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.4.7/firezone-gateway_1.4.7_aarch64",
"https://www.github.com/firezone/firezone/releases/download/gateway-1.4.8/firezone-gateway_1.4.8_aarch64",
permanent: false,
},
{
source: "/dl/firezone-gateway/latest/armv7",
destination:
// mark:current-gateway-version
"https://www.github.com/firezone/firezone/releases/download/gateway-1.4.7/firezone-gateway_1.4.7_armv7",
"https://www.github.com/firezone/firezone/releases/download/gateway-1.4.8/firezone-gateway_1.4.8_armv7",
permanent: false,
},
/*

View File

@@ -5,7 +5,7 @@ export async function GET(_req: NextRequest) {
const versions = {
portal: await get("deployed_sha"),
// mark:current-apple-version
apple: "1.4.13",
apple: "1.4.14",
// mark:current-android-version
android: "1.4.8",
// mark:current-gui-version
@@ -13,7 +13,7 @@ export async function GET(_req: NextRequest) {
// mark:current-headless-version
headless: "1.4.7",
// mark:current-gateway-version
gateway: "1.4.7",
gateway: "1.4.8",
};
return NextResponse.json(versions, {