From 978d373893eb8f354f4467d785686987b0218925 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:22:38 +0530 Subject: [PATCH 1/3] github: update automerge action Signed-off-by: Harsh Shandilya --- .github/workflows/automerge.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 0263b366..ff66b7bb 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -22,8 +22,8 @@ jobs: runs-on: ubuntu-latest steps: - name: automerge - uses: "pascalgn/automerge-action@v0.11.0" + uses: pascalgn/automerge-action@88480459fd3771b8f4c7e68bb9b677b5e1e48f36 env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - UPDATE_RETRIES: 10 - UPDATE_RETRY_SLEEP: 60000 + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MERGE_RETRIES: 10 + MERGE_RETRY_SLEEP: 60000 From f3107ed19afe647146002a8772c853476e1be8c3 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:24:54 +0530 Subject: [PATCH 2/3] github: update actions in pull request workflow Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 06628731..e1643211 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check if relevant files have changed - uses: actions/github-script@0.9.0 + uses: actions/github-script@28e5ebafd79744f2a15dd15e742233b068e0f762 id: service-changed with: result-encoding: string @@ -23,20 +23,20 @@ jobs: - name: Checkout repository if: ${{ steps.service-changed.outputs.result == 'true' }} - uses: actions/checkout@v2 + uses: actions/checkout@c952173edf28a2bd22e1a4926590c1ac39630461 - name: Copy CI gradle.properties if: ${{ steps.service-changed.outputs.result == 'true' }} run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - uses: burrunan/gradle-cache-action@v1 + - uses: burrunan/gradle-cache-action@61348edb3ed90fd775bd9738ac6535163f5b8c4b name: Run unit tests with: arguments: testDebug - name: (Fail-only) upload test report if: failure() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@27bce4eee761b5bc643f46a8dfb41b430c8d05f6 with: name: Test report path: app/build/reports From 646ab03660118b18d815b3ea6fba878a60cf6130 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 18 Oct 2020 22:28:58 +0530 Subject: [PATCH 3/3] github: switch gradle-cache-action back to tag qualifier Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e1643211..2ff153f8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -29,7 +29,7 @@ jobs: if: ${{ steps.service-changed.outputs.result == 'true' }} run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties - - uses: burrunan/gradle-cache-action@61348edb3ed90fd775bd9738ac6535163f5b8c4b + - uses: burrunan/gradle-cache-action@v1 name: Run unit tests with: arguments: testDebug