chore: Cut all clients to ship search domains (#8442)

Waiting on app reviews to be approved, then this PR will be ready to
merge.
This commit is contained in:
Jamil
2025-03-17 12:25:11 -05:00
committed by GitHub
parent 0a00244913
commit e642eefb35
22 changed files with 91 additions and 57 deletions

View File

@@ -131,9 +131,9 @@ jobs:
target: [x86_64-pc-windows-msvc]
package: [firezone-headless-client]
# mark:next-headless-version
release_name: [headless-client-1.4.5]
release_name: [headless-client-1.4.6]
# mark:next-headless-version
version: [1.4.5]
version: [1.4.6]
env:
ARTIFACT_PATH: ${{ matrix.artifact }}_${{ matrix.version }}_${{ matrix.arch }}.exe
RELEASE_NAME: ${{ matrix.release_name }}
@@ -215,9 +215,9 @@ jobs:
artifact: firezone-client-headless-linux
image_name: client
# mark:next-headless-version
release_name: headless-client-1.4.5
release_name: headless-client-1.4.6
# mark:next-headless-version
version: 1.4.5
version: 1.4.6
- package: firezone-relay
artifact: firezone-relay
image_name: relay

View File

@@ -28,7 +28,7 @@ jobs:
contents: write # for updating the release draft
env:
# mark:next-android-version
RELEASE_NAME: android-client-1.4.5
RELEASE_NAME: android-client-1.4.6
steps:
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}"
@@ -99,7 +99,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# mark:next-android-version
RELEASE_NAME: android-client-1.4.5
RELEASE_NAME: android-client-1.4.6
run: |
export ARTIFACT_PATH="$RUNNER_TEMP/firezone-${RELEASE_NAME}.${{ matrix.package-type }}"
cp "${{ matrix.output-path }}" "$ARTIFACT_PATH"

View File

@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-22.04
env:
# mark:next-apple-version
RELEASE_NAME: macos-client-1.4.7
RELEASE_NAME: macos-client-1.4.8
steps:
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}"
@@ -53,9 +53,9 @@ 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.7.dmg"
artifact-file: "firezone-macos-client-1.4.8.dmg"
# mark:next-apple-version
release-name: macos-client-1.4.7
release-name: macos-client-1.4.8
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:

View File

@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-22.04
env:
# mark:next-gui-version
RELEASE_NAME: gui-client-1.4.9
RELEASE_NAME: gui-client-1.4.10
steps:
- uses: release-drafter/release-drafter@b1476f6e6eb133afa41ed8589daba6dc69b4d3f5 # v6.1.0
if: "${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'main' }}"
@@ -57,19 +57,19 @@ jobs:
pkg-extension: msi
env:
# mark:next-gui-version
ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.4.9_${{ matrix.arch }}
ARTIFACT_SRC: ./rust/gui-client/firezone-client-gui-${{ matrix.os }}_1.4.10_${{ matrix.arch }}
# mark:next-gui-version
ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.4.9_${{ matrix.arch }}
ARTIFACT_DST: firezone-client-gui-${{ matrix.os }}_1.4.10_${{ matrix.arch }}
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_CERT_NAME: ${{ secrets.AZURE_CERT_NAME }}
# mark:next-gui-version
BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.4.9_${{ matrix.arch }}
BINARY_DEST_PATH: firezone-client-gui-${{ matrix.os }}_1.4.10_${{ matrix.arch }}
# Seems like there's no way to de-dupe env vars that depend on each other
# mark:next-gui-version
FIREZONE_GUI_VERSION: 1.4.9
FIREZONE_GUI_VERSION: 1.4.10
RENAME_SCRIPT: ../../scripts/build/tauri-rename-${{ matrix.os }}.sh
TEST_INSTALL_SCRIPT: ../../scripts/tests/gui-client-install-${{ matrix.os }}-${{ matrix.pkg-extension }}.sh
TARGET_DIR: ../target

View File

@@ -50,7 +50,7 @@ jobs:
- release_name: gateway-1.4.6
config_name: release-drafter-gateway.yml
# mark:next-headless-version
- release_name: headless-client-1.4.5
- release_name: headless-client-1.4.6
config_name: release-drafter-headless-client.yml
steps:

View File

@@ -42,7 +42,7 @@ jobs:
elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then
ARTIFACT=client
# mark:next-headless-version
VERSION="1.4.5"
VERSION="1.4.6"
else
echo "Shouldn't have gotten here. Exiting."
exit 1

View File

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

10
rust/Cargo.lock generated
View File

@@ -1003,7 +1003,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af"
[[package]]
name = "connlib-client-android"
version = "1.4.5"
version = "1.4.6"
dependencies = [
"android_log-sys",
"anyhow",
@@ -1036,7 +1036,7 @@ dependencies = [
[[package]]
name = "connlib-client-apple"
version = "1.4.7"
version = "1.4.8"
dependencies = [
"anyhow",
"backoff",
@@ -2018,7 +2018,7 @@ dependencies = [
[[package]]
name = "firezone-gui-client"
version = "1.4.9"
version = "1.4.10"
dependencies = [
"anyhow",
"atomicwrites",
@@ -2063,7 +2063,7 @@ dependencies = [
[[package]]
name = "firezone-gui-client-common"
version = "1.4.9"
version = "1.4.10"
dependencies = [
"anyhow",
"arboard",
@@ -2105,7 +2105,7 @@ dependencies = [
[[package]]
name = "firezone-headless-client"
version = "1.4.5"
version = "1.4.6"
dependencies = [
"anyhow",
"atomicwrites",

View File

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

View File

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

View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gui-client-common"
# mark:next-gui-version
version = "1.4.9"
version = "1.4.10"
edition = { workspace = true }
license = { workspace = true }

View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gui-client"
# mark:next-gui-version
version = "1.4.9"
version = "1.4.10"
description = "Firezone"
edition = { workspace = true }
default-run = "firezone-gui-client"

View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-headless-client"
# mark:next-headless-version
version = "1.4.5"
version = "1.4.6"
edition = { workspace = true }
authors = ["Firezone, Inc."]
license = { workspace = true }

View File

@@ -588,7 +588,7 @@ impl<'a> Handler<'a> {
// The IPC service must use the GUI's version number, not the Headless Client's.
// But refactoring to separate the IPC service from the Headless Client will take a while.
// mark:next-gui-version
get_user_agent(None, "1.4.9"),
get_user_agent(None, "1.4.10"),
"client",
(),
|| {

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.6"
next_apple_version="1.4.7"
current_apple_version="1.4.7"
next_apple_version="1.4.8"
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;}' {} \;
@@ -82,8 +82,8 @@ function apple() {
# 7. Commit the changes and open a PR. Ensure the Changelog is correctly
# updated with the changes.
function android() {
current_android_version="1.4.4"
next_android_version="1.4.5"
current_android_version="1.4.5"
next_android_version="1.4.6"
find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_android_version}"'/g;}' {} \;
find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_android_version}"'/g;}' {} \;
@@ -107,8 +107,8 @@ function android() {
# 5. Commit the changes and open a PR. Ensure the Changelog is correctly
# updated with the changes.
function gui() {
current_gui_version="1.4.8"
next_gui_version="1.4.9"
current_gui_version="1.4.9"
next_gui_version="1.4.10"
find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gui_version}"'/g;}' {} \;
find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_gui_version}"'/g;}' {} \;
@@ -131,8 +131,8 @@ function gui() {
# 4. Commit the changes and open a PR. Ensure the Changelog is correctly
# updated with the changes.
function headless() {
current_headless_version="1.4.4"
next_headless_version="1.4.5"
current_headless_version="1.4.5"
next_headless_version="1.4.6"
find website -type f -name "redirects.js" -exec sed "${SEDARG[@]}" -e '/mark:current-headless-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_headless_version}"'/g;}' {} \;
find website -type f -name "route.ts" -exec sed "${SEDARG[@]}" -e '/mark:current-headless-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/'"${current_headless_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.7;
MARKETING_VERSION = 1.4.8;
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.7;
MARKETING_VERSION = 1.4.8;
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.7;
MARKETING_VERSION = 1.4.8;
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.7;
MARKETING_VERSION = 1.4.8;
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.7;
MARKETING_VERSION = 1.4.8;
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.7;
MARKETING_VERSION = 1.4.8;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
PRODUCT_NAME = "$(TARGET_NAME)";

View File

@@ -10,7 +10,7 @@ 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.6/firezone-macos-client-1.4.6.dmg",
"https://www.github.com/firezone/firezone/releases/download/macos-client-1.4.7/firezone-macos-client-1.4.7.dmg",
permanent: false,
},
/*
@@ -22,7 +22,7 @@ module.exports = [
source: "/dl/firezone-client-android/latest",
destination:
// mark:current-android-version
"https://www.github.com/firezone/firezone/releases/download/android-client-1.4.4/firezone-android-client-1.4.4.apk",
"https://www.github.com/firezone/firezone/releases/download/android-client-1.4.5/firezone-android-client-1.4.5.apk",
permanent: false,
},
/*
@@ -34,7 +34,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.4.8/firezone-client-gui-windows_1.4.8_x86_64.msi",
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.9/firezone-client-gui-windows_1.4.9_x86_64.msi",
permanent: false,
},
/*
@@ -46,7 +46,7 @@ module.exports = [
source: "/dl/firezone-client-headless-windows/latest/x86_64",
destination:
// mark:current-headless-version
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.4.4/firezone-client-headless-windows_1.4.4_x86_64.exe",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.4.5/firezone-client-headless-windows_1.4.5_x86_64.exe",
permanent: false,
},
/*
@@ -58,35 +58,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.4.8/firezone-client-gui-linux_1.4.8_x86_64.deb",
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.9/firezone-client-gui-linux_1.4.9_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.4.8/firezone-client-gui-linux_1.4.8_aarch64.deb",
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.4.9/firezone-client-gui-linux_1.4.9_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.4.4/firezone-client-headless-linux_1.4.4_x86_64",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.4.5/firezone-client-headless-linux_1.4.5_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.4.4/firezone-client-headless-linux_1.4.4_aarch64",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.4.5/firezone-client-headless-linux_1.4.5_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.4.4/firezone-client-headless-linux_1.4.4_armv7",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.4.5/firezone-client-headless-linux_1.4.5_armv7",
permanent: false,
},
/*

View File

@@ -5,13 +5,13 @@ export async function GET(_req: NextRequest) {
const versions = {
portal: await get("deployed_sha"),
// mark:current-apple-version
apple: "1.4.6",
apple: "1.4.7",
// mark:current-android-version
android: "1.4.4",
android: "1.4.5",
// mark:current-gui-version
gui: "1.4.8",
gui: "1.4.9",
// mark:current-headless-version
headless: "1.4.4",
headless: "1.4.5",
// mark:current-gateway-version
gateway: "1.4.5",
};

View File

@@ -20,9 +20,14 @@ export default function Android() {
<Entries downloadLinks={downloadLinks} title="Android">
{/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */}
<Unreleased></Unreleased>
<Entry version="1.4.4" date={new Date("2025-03-13")}>
<Entry version="1.4.5" date={new Date("2025-03-15")}>
<ChangeItem pull="8445">
Fixes a bug where search domains changes weren't applied if already signed in.
</ChangeItem>
</Entry>
<Entry version="1.4.4" date={new Date("2025-03-14")}>
<ChangeItem pull="8436">
Adds support for search domains configured in the admin portal.
Applies the search domain configured in the admin portal, if any.
</ChangeItem>
</Entry>
<Entry version="1.4.3" date={new Date("2025-03-10")}>

View File

@@ -20,6 +20,11 @@ export default function Apple() {
<Entries downloadLinks={downloadLinks} title="macOS / iOS">
{/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */}
<Unreleased></Unreleased>
<Entry version="1.4.7" date={new Date("2025-03-14")}>
<ChangeItem pull="8421">
Applies the search domain configured in the admin portal, if any.
</ChangeItem>
</Entry>
<Entry version="1.4.6" date={new Date("2025-03-11")}>
<ChangeItem pull="8282">
Shows friendlier and more-human alert messages when something goes

View File

@@ -9,6 +9,18 @@ export default function GUI({ os }: { os: OS }) {
<Entries downloadLinks={downloadLinks(os)} title={title(os)}>
{/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */}
<Unreleased></Unreleased>
<Entry version="1.4.9" date={new Date("2025-03-14")}>
{os === OS.Windows && (
<ChangeItem pull="8422">
Applies the search domain configured in the admin portal, if any.
</ChangeItem>
)}
{os === OS.Linux && (
<ChangeItem pull="8378">
Applies the search domain configured in the admin portal, if any.
</ChangeItem>
)}
</Entry>
<Entry version="1.4.8" date={new Date("2025-03-10")}>
<ChangeItem pull="8286">
Fixes a bug that prevented certain Resource fields from being updated

View File

@@ -10,6 +10,18 @@ export default function Headless({ os }: { os: OS }) {
<Entries downloadLinks={downloadLinks(os)} title={title(os)}>
{/* When you cut a release, remove any solved issues from the "known issues" lists over in `client-apps`. This must not be done when the issue's PR merges. */}
<Unreleased></Unreleased>
<Entry version="1.4.5" date={new Date("2025-03-14")}>
{os === OS.Windows && (
<ChangeItem pull="8422">
Applies the search domain configured in the admin portal, if any.
</ChangeItem>
)}
{os === OS.Linux && (
<ChangeItem pull="8378">
Applies the search domain configured in the admin portal, if any.
</ChangeItem>
)}
</Entry>
<Entry version="1.4.4" date={new Date("2025-03-10")}>
{os === OS.Linux && (
<ChangeItem pull="8117">