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 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2ff153f8..995ff811 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -1,32 +1,23 @@ -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 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 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" +]