diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml deleted file mode 100644 index 9a3a1bc..0000000 --- a/.github/workflows/auto-merge.yaml +++ /dev/null @@ -1,18 +0,0 @@ -name: Auto-Merge - -on: - pull_request: - -permissions: - contents: write - pull-requests: write - -jobs: - merge: - if: github.actor == 'dependabot[bot]' || github.actor == 'pre-commit-ci[bot]' - runs-on: ubuntu-latest - steps: - - name: Enable auto-merge - run: gh pr merge ${{ github.event.pull_request.html_url }} --auto - env: - GH_TOKEN: ${{ github.token }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 985f59a..4800609 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,9 +1,7 @@ -name: CI/CD +name: CI on: push: - branches: - - main permissions: contents: write @@ -74,6 +72,7 @@ release: name: Create GitHub Release + if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest outputs: releases-created: ${{ steps.release.outputs.releases_created }} diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml new file mode 100644 index 0000000..576885f --- /dev/null +++ b/.github/workflows/merge.yaml @@ -0,0 +1,18 @@ +name: Merge + +on: + pull_request: + +permissions: + contents: write + pull-requests: write + +jobs: + merge: + if: github.actor == 'dependabot[bot]' || github.actor == 'pre-commit-ci[bot]' + runs-on: ubuntu-latest + steps: + - name: Enable auto-merge + run: gh pr merge ${{ github.event.pull_request.html_url }} --auto + env: + GH_TOKEN: ${{ github.token }}