From 3b8bc2985b25c0c0768798866c77cc11539acf3f Mon Sep 17 00:00:00 2001 From: cartland Date: Thu, 17 Apr 2025 11:33:08 -0700 Subject: [PATCH 1/3] Add workflow_dispatch trigger to workflows from GitHub --- .github/workflows/BasicSample.yaml | 1 + .github/workflows/TwoWaySample.yaml | 3 ++- .github/workflows/copy-branch.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/BasicSample.yaml b/.github/workflows/BasicSample.yaml index 8023346..9b1d124 100644 --- a/.github/workflows/BasicSample.yaml +++ b/.github/workflows/BasicSample.yaml @@ -1,6 +1,7 @@ name: BasicSample on: + workflow_dispatch: push: branches: - main diff --git a/.github/workflows/TwoWaySample.yaml b/.github/workflows/TwoWaySample.yaml index af09ab9..75eb0d5 100644 --- a/.github/workflows/TwoWaySample.yaml +++ b/.github/workflows/TwoWaySample.yaml @@ -1,6 +1,7 @@ name: TwoWaySample on: + workflow_dispatch: push: branches: - main @@ -68,4 +69,4 @@ jobs: uses: actions/upload-artifact@v3 with: name: build-reports-TwoWaySample - path: ${{ env.SAMPLE_PATH }}/app/build/reports \ No newline at end of file + path: ${{ env.SAMPLE_PATH }}/app/build/reports 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 04a23b95248c023112b39781cf1a90df8ddcbef3 Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 15:43:21 -0700 Subject: [PATCH 2/3] Update GitHub Action versions - actions/checkout - actions/setup-java - actions/upload-artifact --- .github/workflows/BasicSample.yaml | 6 +++--- .github/workflows/TwoWaySample.yaml | 8 ++++---- .github/workflows/copy-branch.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/BasicSample.yaml b/.github/workflows/BasicSample.yaml index 9b1d124..70de6aa 100644 --- a/.github/workflows/BasicSample.yaml +++ b/.github/workflows/BasicSample.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties @@ -59,14 +59,14 @@ jobs: working-directory: ${{ env.SAMPLE_PATH }} - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-outputs-BasicSample path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-reports-BasicSample path: ${{ env.SAMPLE_PATH }}/app/build/reports diff --git a/.github/workflows/TwoWaySample.yaml b/.github/workflows/TwoWaySample.yaml index 75eb0d5..87e8479 100644 --- a/.github/workflows/TwoWaySample.yaml +++ b/.github/workflows/TwoWaySample.yaml @@ -23,13 +23,13 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy CI gradle.properties run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - name: Set up JDK 11 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 11 @@ -59,14 +59,14 @@ jobs: working-directory: ${{ env.SAMPLE_PATH }} - name: Upload build outputs (APKs) - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-outputs-TwoWaySample path: ${{ env.SAMPLE_PATH }}/app/build/outputs - name: Upload build reports if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-reports-TwoWaySample path: ${{ env.SAMPLE_PATH }}/app/build/reports 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 92b5acb037b38f302d6c3b4068786bd79dc10d92 Mon Sep 17 00:00:00 2001 From: cartland Date: Mon, 5 May 2025 16:06:21 -0700 Subject: [PATCH 3/3] Update GitHub Actions cache to v4 This commit updates the GitHub Actions cache version to v4 in the following workflow files: - .github/workflows/BasicSample.yaml - .github/workflows/TwoWaySample.yaml --- .github/workflows/BasicSample.yaml | 2 +- .github/workflows/TwoWaySample.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BasicSample.yaml b/.github/workflows/BasicSample.yaml index 70de6aa..7cc1140 100644 --- a/.github/workflows/BasicSample.yaml +++ b/.github/workflows/BasicSample.yaml @@ -37,7 +37,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-* diff --git a/.github/workflows/TwoWaySample.yaml b/.github/workflows/TwoWaySample.yaml index 87e8479..dc1c2f5 100644 --- a/.github/workflows/TwoWaySample.yaml +++ b/.github/workflows/TwoWaySample.yaml @@ -37,7 +37,7 @@ jobs: - name: Generate cache key run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.gradle/caches/modules-*