From 08f6e36d35daedef1b4e5375230b7ad520d23645 Mon Sep 17 00:00:00 2001 From: Michael Latman Date: Tue, 26 Nov 2024 22:08:52 -0500 Subject: [PATCH] Fix auto merge --- .github/workflows/update-packages.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/update-packages.yml b/.github/workflows/update-packages.yml index c4da84f..c6daac9 100644 --- a/.github/workflows/update-packages.yml +++ b/.github/workflows/update-packages.yml @@ -64,13 +64,15 @@ jobs: This PR was automatically generated by the package update workflow. branch: update-package-list base: main - delete-branch: true - - - name: Merge Pull Request + delete-branch: true + labels: | + automated pr + automerge + + - name: Enable Auto-Merge if: steps.git-check.outputs.changes == 'true' - uses: peter-evans/create-or-update-pull-request@v5 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: ${{ steps.commit-msg.outputs.message }} - branch: update-package-list - base: main \ No newline at end of file + run: | + PR_NUMBER=$(gh pr list --json number --jq '.[0].number') + gh pr merge $PR_NUMBER --auto --merge + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file