From 07d46605c77243f653770ada40a3b61e8650e8f7 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 8 Oct 2020 01:13:43 +0530 Subject: [PATCH] github: tweak workflows and remove unused cruft Signed-off-by: Harsh Shandilya --- .github/auto-merge.yml | 3 --- .github/workflows/automerge.yml | 2 ++ .github/workflows/pull_request.yml | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 .github/auto-merge.yml diff --git a/.github/auto-merge.yml b/.github/auto-merge.yml deleted file mode 100644 index 2f40196d..00000000 --- a/.github/auto-merge.yml +++ /dev/null @@ -1,3 +0,0 @@ -requiredLabels: - - automerge -deleteBranchAfterMerge: true diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 93081ee6..0263b366 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -25,3 +25,5 @@ jobs: uses: "pascalgn/automerge-action@v0.11.0" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + UPDATE_RETRIES: 10 + UPDATE_RETRY_SLEEP: 60000 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 1ce29317..06628731 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -17,9 +17,9 @@ jobs: pull_number: context.payload.number, per_page: 100 }) - const serviceChanged = result.data.filter(f => f.filename.startsWith("app/") || f.filename.endsWith("gradle") || f.filename.startsWith(".github/workflows/pull_request.yml") || f.filename.startsWith("gradle") || f.filename.endsWith("properties")).length > 0 - console.log(serviceChanged) - return serviceChanged + const shouldRun = result.data.filter(f => !f.filename.endsWith(".md") || !f.filename.endsWith(".yml")).length > 0 + console.log(shouldRun) + return shouldRun - name: Checkout repository if: ${{ steps.service-changed.outputs.result == 'true' }}