From 0fc9ca177e5f11519e8f0b76ee669af25dca2998 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:39:13 -0700 Subject: [PATCH 1/3] doc: Add blank CHANGELOG entry for 1.1.2 to tell `release-plz` that it's already been released --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ee4b734..b5a7fbe6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## [1.1.2] + ## [1.1.1] ### Added From 31b23640a8deecf93fd56883a70447f45bf68ba6 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:46:21 -0700 Subject: [PATCH 2/3] Revert "ci: Bug fix? Test with no explicit auth in "Enable auto-merge" step" This reverts commit 62705957468fc94887ea88ab7f7de5b47a222e55. --- .github/workflows/auto_merge_prs.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_merge_prs.yml b/.github/workflows/auto_merge_prs.yml index 916b4c79..01293913 100644 --- a/.github/workflows/auto_merge_prs.yml +++ b/.github/workflows/auto_merge_prs.yml @@ -15,8 +15,9 @@ jobs: if: ${{ github.actor == 'dependabot[bot]' }} uses: dependabot/fetch-metadata@v2.1.0 with: - github-token: ${{ github.token }} + github-token: "${{ github.token }}" - name: Enable auto-merge run: gh pr merge --auto --merge "$PR_URL" env: - PR_URL: ${{github.event.pull_request.html_url}} + PR_URL: ${{github.event.pull_request.html_url}}∂ + GH_TOKEN: "${{ secrets.RELEASE_PLZ_PAT }}" From eacdfde7daff34f154f73913abe3c6c63ff7bbc3 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 28 Apr 2024 12:47:11 -0700 Subject: [PATCH 3/3] ci: Fix typo --- .github/workflows/auto_merge_prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto_merge_prs.yml b/.github/workflows/auto_merge_prs.yml index 01293913..260723a4 100644 --- a/.github/workflows/auto_merge_prs.yml +++ b/.github/workflows/auto_merge_prs.yml @@ -19,5 +19,5 @@ jobs: - name: Enable auto-merge run: gh pr merge --auto --merge "$PR_URL" env: - PR_URL: ${{github.event.pull_request.html_url}}∂ + PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: "${{ secrets.RELEASE_PLZ_PAT }}"