diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23f9641..14775e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,12 +1,16 @@ name: build on: - pull_request: {} - merge_group: + pull_request: + branches: [ "main" ] + push: branches: [ "main" ] -jobs: +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true +jobs: changed-files: name: changed-files runs-on: ubuntu-latest @@ -99,7 +103,7 @@ jobs: runs-on: ubuntu-latest if: ${{ always() && !cancelled() && !failure() && github.actor == 'dependabot[bot]' }} steps: - - run: gh pr merge --auto "$PR_URL" + - run: gh pr merge --rebase --auto "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 850b352..8c1a046 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,8 +1,8 @@ name: Coverage on: - merge_group: - types: [ checks_requested ] + push: + branches: [ "main" ] jobs: coverage: