From 368ace2c6e5708ec7d7251cf7967c4552f4bbcd0 Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 21 Apr 2025 14:12:27 -0700 Subject: [PATCH] ci: Release Android 1.4.7 (#8878) App is live on Play store. --- .github/workflows/_kotlin.yml | 4 ++-- kotlin/android/app/build.gradle.kts | 2 +- rust/Cargo.lock | 2 +- rust/connlib/clients/android/Cargo.toml | 2 +- scripts/bump-versions.sh | 4 ++-- website/redirects.js | 2 +- website/src/app/api/releases/route.ts | 2 +- website/src/components/Changelog/Android.tsx | 8 +++++--- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml index 1faba00cb..42cb8d6ae 100644 --- a/.github/workflows/_kotlin.yml +++ b/.github/workflows/_kotlin.yml @@ -28,7 +28,7 @@ jobs: contents: write # for updating the release draft env: # mark:next-android-version - RELEASE_NAME: android-client-1.4.7 + RELEASE_NAME: android-client-1.4.8 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.7 + RELEASE_NAME: android-client-1.4.8 run: | export ARTIFACT_PATH="$RUNNER_TEMP/firezone-${RELEASE_NAME}.${{ matrix.package-type }}" cp "${{ matrix.output-path }}" "$ARTIFACT_PATH" diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 8e5da71d7..f63ba344c 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -53,7 +53,7 @@ android { targetSdk = 35 versionCode = (System.currentTimeMillis() / 1000 / 10).toInt() // mark:next-android-version - versionName = "1.4.7" + versionName = "1.4.8" multiDexEnabled = true testInstrumentationRunner = "dev.firezone.android.core.HiltTestRunner" diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3a785ecf1..3dc219b0c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -1189,7 +1189,7 @@ checksum = "baf0a07a401f374238ab8e2f11a104d2851bf9ce711ec69804834de8af45c7af" [[package]] name = "connlib-client-android" -version = "1.4.7" +version = "1.4.8" dependencies = [ "android_log-sys", "anyhow", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index 9543520ff..b0238d6ac 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.4.7" +version = "1.4.8" edition = { workspace = true } license = { workspace = true } diff --git a/scripts/bump-versions.sh b/scripts/bump-versions.sh index 28eb00a29..93f2c58c2 100755 --- a/scripts/bump-versions.sh +++ b/scripts/bump-versions.sh @@ -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.6" - next_android_version="1.4.7" + current_android_version="1.4.7" + next_android_version="1.4.8" 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;}' {} \; diff --git a/website/redirects.js b/website/redirects.js index ac05ebdf1..f5571b58c 100644 --- a/website/redirects.js +++ b/website/redirects.js @@ -29,7 +29,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.6/firezone-android-client-1.4.6.apk", + "https://www.github.com/firezone/firezone/releases/download/android-client-1.4.7/firezone-android-client-1.4.7.apk", permanent: false, }, /* diff --git a/website/src/app/api/releases/route.ts b/website/src/app/api/releases/route.ts index 236344673..af05b544a 100644 --- a/website/src/app/api/releases/route.ts +++ b/website/src/app/api/releases/route.ts @@ -7,7 +7,7 @@ export async function GET(_req: NextRequest) { // mark:current-apple-version apple: "1.4.11", // mark:current-android-version - android: "1.4.6", + android: "1.4.7", // mark:current-gui-version gui: "1.4.10", // mark:current-headless-version diff --git a/website/src/components/Changelog/Android.tsx b/website/src/components/Changelog/Android.tsx index 89cf297bb..1558e4170 100644 --- a/website/src/components/Changelog/Android.tsx +++ b/website/src/components/Changelog/Android.tsx @@ -19,11 +19,12 @@ export default function Android() { return ( {/* 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. */} - + + Improves performance of relayed connections on IPv4-only systems. - + Fixes a performance regression that could lead to packet drops under @@ -35,7 +36,8 @@ export default function Android() { - Fixes a bug where search domains changes weren't applied if already signed in. + Fixes a bug where search domains changes weren't applied if already + signed in.