From 67a5acd1c2983c72b9c079edcfb394a873ba07ee Mon Sep 17 00:00:00 2001 From: cartland Date: Tue, 6 May 2025 11:37:15 -0700 Subject: [PATCH 1/2] Update Android workflow to use ubuntu-latest This commit updates the Android workflow file `.github/workflows/android.yml` to use the `ubuntu-latest` runner image instead of `ubuntu-18.04`. --- .github/workflows/android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 907c3615..cbcf642f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -25,7 +25,7 @@ jobs: build: name: Build - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 From 084ba258e636604c28da6cace59e87fe82cf9d24 Mon Sep 17 00:00:00 2001 From: cartland Date: Tue, 6 May 2025 11:41:59 -0700 Subject: [PATCH 2/2] Update Android workflow: Use JDK 17 and checkout v4 This commit updates the Android workflow file `.github/workflows/android.yml` to: - Use JDK 17 instead of JDK 1.8 - Use actions/checkout@v4 - Use actions/setup-java@v4 - Use actions/upload-artifact@v4 It also updates `.github/workflows/copy-branch.yml` to use actions/checkout@v4. --- .github/workflows/android.yml | 12 +++++++----- .github/workflows/copy-branch.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index cbcf642f..e306f7a8 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -28,17 +28,19 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v4 + - name: set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: 1.8 + distribution: 'zulu' + java-version: '17' + cache: 'gradle' - name: Build project run: .github/scripts/gradlew_recursive.sh assembleDebug - name: Zip artifacts run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so' - name: Upload artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: assemble path: assemble.zip diff --git a/.github/workflows/copy-branch.yml b/.github/workflows/copy-branch.yml index a1a0f006..32c2d94d 100644 --- a/.github/workflows/copy-branch.yml +++ b/.github/workflows/copy-branch.yml @@ -20,7 +20,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it, # but specifies master branch (old default). - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 ref: master