diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml new file mode 100644 index 00000000..ff396a2c --- /dev/null +++ b/.github/workflows/auto-merge.yaml @@ -0,0 +1,13 @@ +name: Auto Merge +on: + pull_request: +jobs: + auto-merge: + runs-on: ubuntu-latest + steps: + - id: auto-merge + uses: "pascalgn/automerge-action@v0.15.6" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "" + MERGE_METHOD: "squash" diff --git a/.github/workflows/auto-update.yaml b/.github/workflows/auto-update.yaml deleted file mode 100644 index 783d7288..00000000 --- a/.github/workflows/auto-update.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: autoupdate -on: - push: - branches: - - main - - master - - trunk -jobs: - autoupdate: - name: autoupdate - runs-on: latest - steps: - - uses: docker://chinthakagodawita/autoupdate-action:v1.7.0 - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"