From 4ec96df51481c27691dbf736c853029d3f40a9b7 Mon Sep 17 00:00:00 2001
From: "K. Shankari" <shankari@damajash.org>
Date: Sun, 5 May 2024 15:47:56 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20=E2=AC=86=EF=B8=8F=20=20Upgrade?=
 =?UTF-8?q?=20the=20pinned=20version=20of=20the=20runner=20to=2014-large?=
 =?UTF-8?q?=20(#1153)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 💚 ⬆️  Upgrade the pinned version of the runner to 14-large

This should still have the correct environment variable because `14-large` runs x64
https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md

`macos-14` now runs amd, and we have to figure out how to run it.
Maybe we can run both as part of a schedule instead of on every pull request

* 💚 Switch to the macos version supported for free public repos

Switch to the environmental variable supported by it
https://github.com/actions/runner-images/blob/main/images/macos/macos-14-arm64-Readme.md

* 💚 Set all instances of JAVA_HOME to the new arm64 value
---
 .github/workflows/android-build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 90c75d147..ddc6b2ee0 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -22,7 +22,7 @@ jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: macos-13
+    runs-on: macos-14
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -39,7 +39,7 @@ jobs:
         echo "Default java version"
         java -version
         echo "Setting to Java 11 instead"
-        export JAVA_HOME=$JAVA_HOME_11_X64
+        export JAVA_HOME=$JAVA_HOME_17_arm64
         java -version
         echo "Checking gradle"
         which gradle
@@ -53,13 +53,13 @@ jobs:
     - name: Setup the cordova environment
       shell: bash -l {0}
       run: |
-        export JAVA_HOME=$JAVA_HOME_11_X64
+        export JAVA_HOME=$JAVA_HOME_17_arm64
         bash setup/setup_android_native.sh
 
     - name: Check tool versions
       shell: bash -l {0}
       run: |
-        export JAVA_HOME=$JAVA_HOME_11_X64
+        export JAVA_HOME=$JAVA_HOME_17_arm64
         source setup/activate_native.sh
         echo "cordova version"
         npx cordova -version
@@ -77,7 +77,7 @@ jobs:
         gradle -version
         echo "Let's rerun the activation"
         source setup/activate_native.sh
-        export JAVA_HOME=$JAVA_HOME_11_X64
+        export JAVA_HOME=$JAVA_HOME_17_arm64
         echo $PATH
         which gradle
         gradle --version