From 9d271eb932198768deae6d5d6f0abccbe8ce3b18 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 28 Oct 2020 04:45:26 +0530 Subject: [PATCH 1/4] github: remove automerge action Signed-off-by: Harsh Shandilya --- .github/workflows/automerge.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index ff66b7bb..00000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: automerge -on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - check_suite: - types: - - completed - status: {} -jobs: - automerge: - runs-on: ubuntu-latest - steps: - - name: automerge - uses: pascalgn/automerge-action@88480459fd3771b8f4c7e68bb9b677b5e1e48f36 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MERGE_RETRIES: 10 - MERGE_RETRY_SLEEP: 60000 From 7b0f7639e97760529cb5752d65011a168780de73 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 28 Oct 2020 04:45:40 +0530 Subject: [PATCH 2/4] github: run checks on pushes to staging and trying Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2ff153f8..faa2a7da 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -1,6 +1,15 @@ -on: [pull_request] +name: CI + +"on": + push: + branches: + - staging + - trying + - develop + pull_request: + branches: + - "**" -name: Check pull request jobs: test-pr: runs-on: ubuntu-latest From 1e3b321dcf58494d466ffe89a17ede06645f59f0 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 28 Oct 2020 04:45:46 +0530 Subject: [PATCH 3/4] bors: init Signed-off-by: Harsh Shandilya --- bors.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 bors.toml diff --git a/bors.toml b/bors.toml new file mode 100644 index 00000000..0330ab92 --- /dev/null +++ b/bors.toml @@ -0,0 +1,3 @@ +status = [ + "test-pr" +] From fa281cb400c23d052dc15ed576611e2e915b5e44 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 28 Oct 2020 04:57:01 +0530 Subject: [PATCH 4/4] github: remove file check logic Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index faa2a7da..995ff811 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -14,28 +14,10 @@ jobs: test-pr: runs-on: ubuntu-latest steps: - - name: Check if relevant files have changed - uses: actions/github-script@28e5ebafd79744f2a15dd15e742233b068e0f762 - id: service-changed - with: - result-encoding: string - script: | - const result = await github.pulls.listFiles({ - owner: context.payload.repository.owner.login, - repo: context.payload.repository.name, - pull_number: context.payload.number, - per_page: 100 - }) - 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' }} 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