From 355029f88f7ee42d5b061db7411215c8b6c00971 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:39:54 -0800
Subject: [PATCH] chore(ci): Bump sccache; remove IPC debug build (#3468)

Attempt #1 to speed up slow builds:

- kotlin
- tauri

refs #3456
---
 .github/actions/setup-rust/action.yml |  2 +-
 .github/workflows/_kotlin.yml         | 10 ++++++----
 .github/workflows/_rust.yml           |  1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml
index ddee2e618..3545198c0 100644
--- a/.github/actions/setup-rust/action.yml
+++ b/.github/actions/setup-rust/action.yml
@@ -26,7 +26,7 @@ runs:
         echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> $GITHUB_ENV
       shell: bash
     - if: ${{ inputs.sccache_enabled == 'true' }}
-      uses: mozilla-actions/sccache-action@v0.0.3
+      uses: mozilla-actions/sccache-action@v0.0.4
     - if: ${{ inputs.sccache_enabled }}
       run: echo "RUSTC_WRAPPER=$SCCACHE_PATH" >> $GITHUB_ENV
       shell: bash
diff --git a/.github/workflows/_kotlin.yml b/.github/workflows/_kotlin.yml
index 440ff3c3d..9030fe4ef 100644
--- a/.github/workflows/_kotlin.yml
+++ b/.github/workflows/_kotlin.yml
@@ -9,7 +9,8 @@ permissions:
 
 jobs:
   static-analysis:
-    runs-on: macos-14
+    # Android SDK tools hardware accel is available only on Linux runners
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./kotlin/android
@@ -31,7 +32,8 @@ jobs:
         run: ./gradlew spotlessCheck
 
   build:
-    runs-on: macos-14
+    # Android SDK tools hardware accel is available only on Linux runners
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./kotlin/android
@@ -42,7 +44,7 @@ jobs:
           targets: armv7-linux-androideabi aarch64-linux-android x86_64-linux-android i686-linux-android
       - uses: actions/setup-java@v4
         with:
-          distribution: oracle
+          distribution: temurin
           java-version: 17
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
@@ -60,7 +62,7 @@ jobs:
         run: |
           KEYSTORE_PATH=$(pwd)/app/keystore.jks
           echo -n "$KEYSTORE_BASE64" | base64 --decode > $KEYSTORE_PATH
-          ./gradlew --info bundleRelease
+          ./gradlew bundleRelease
       - name: Run Test
         run: |
           # TODO: See https://github.com/firezone/firezone/issues/2311
diff --git a/.github/workflows/_rust.yml b/.github/workflows/_rust.yml
index 9c367d62c..4294a7915 100644
--- a/.github/workflows/_rust.yml
+++ b/.github/workflows/_rust.yml
@@ -94,7 +94,6 @@ jobs:
       - name: Build release binaries
         run: |
           # Build Windows Tauri GUI
-
           pnpm install
           pnpm build