From d2892f98f96ae79d4607df4b2951a0dcc9433905 Mon Sep 17 00:00:00 2001 From: cartland Date: Thu, 17 Apr 2025 11:33:10 -0700 Subject: [PATCH 1/4] Add workflow_dispatch trigger to workflows from GitHub --- .github/workflows/android.yml | 1 + .github/workflows/copy-branch.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 92b46fd..0121f79 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -15,6 +15,7 @@ name: Android CI on: + workflow_dispatch: push: branches: - main diff --git a/.github/workflows/copy-branch.yml b/.github/workflows/copy-branch.yml index f8f8572..a1a0f00 100644 --- a/.github/workflows/copy-branch.yml +++ b/.github/workflows/copy-branch.yml @@ -5,6 +5,7 @@ name: Duplicates main to old master branch # Controls when the action will run. Triggers the workflow on push or pull request # events but only for the main branch on: + workflow_dispatch: push: branches: [ main ] From bfb66c6e6b1ab1ab31a056ec7278c93312ceabaf Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 15:57:24 -0700 Subject: [PATCH 2/4] Update GitHub Actions checkout version This commit updates the version of the `actions/checkout` action in the following workflows: - `.github/workflows/android.yml` - `.github/workflows/copy-branch.yml` The version is updated from `v2` to `v4`. --- .github/workflows/android.yml | 8 ++++---- .github/workflows/copy-branch.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0121f79..eecf9fa 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -27,17 +27,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: java-version: 11 - name: Generate cache key run: .github/scripts/checksum.sh checksum.txt - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* @@ -54,7 +54,7 @@ jobs: 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 a1a0f00..32c2d94 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 From cc9dc522904fbff932390e324187005c3507849e Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 16:15:06 -0700 Subject: [PATCH 3/4] Update java distribution to zulu This commit updates the java distribution to zulu in the `.github/workflows/android.yml` workflow. --- .github/workflows/android.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index eecf9fa..4369880 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -32,6 +32,7 @@ jobs: - name: set up JDK 11 uses: actions/setup-java@v4 with: + distribution: 'zulu' java-version: 11 - name: Generate cache key From deed28283d188c94a52ec0403bb6b00dbf826233 Mon Sep 17 00:00:00 2001 From: cartland Date: Thu, 15 May 2025 14:36:44 -0700 Subject: [PATCH 4/4] Update JDK version to 17 This commit updates the JDK version used in the `.github/workflows/android.yml` workflow. - Updates the `java-version` from 11 to 17. - Adds gradle cache. --- .github/workflows/android.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 4369880..9a9233d 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -29,11 +29,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: set up JDK 11 + - name: Set Up JDK uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 11 + java-version: '17' + cache: 'gradle' - name: Generate cache key run: .github/scripts/checksum.sh checksum.txt