From 3a4e69eecb003203b667c6b8a050d4d1d02e2bda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 04:24:27 +0000 Subject: [PATCH 1/8] Bump dangoslen/changelog-enforcer from 2 to 3 Bumps [dangoslen/changelog-enforcer](https://github.com/dangoslen/changelog-enforcer) from 2 to 3. - [Release notes](https://github.com/dangoslen/changelog-enforcer/releases) - [Changelog](https://github.com/dangoslen/changelog-enforcer/blob/main/CHANGELOG.md) - [Commits](https://github.com/dangoslen/changelog-enforcer/compare/v2...v3) --- updated-dependencies: - dependency-name: dangoslen/changelog-enforcer dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index a3254389b..c6bbe39bf 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -14,6 +14,6 @@ jobs: uses: actions/checkout@v4 - name: Enforce changelog entry - uses: dangoslen/changelog-enforcer@v2 + uses: dangoslen/changelog-enforcer@v3 with: skipLabels: 'skip-changelog' From 3d9f078013ad4d45629e779c19a3adcae37f1f67 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 05:54:02 +0000 Subject: [PATCH 2/8] update --- .github/workflows/dependabot-auto-merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index af48dc565..c783c7e4e 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -22,6 +22,6 @@ jobs: auto-approve: runs-on: ubuntu-latest - if: github.actor == 'dependabot[bot]' + if: ${{ github.actor == 'dependabot[bot]' }} steps: - uses: hmarr/auto-approve-action@v4 From 16b9b875dcc49715cb85c420f1b503049bbf4fa7 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 21:12:55 +0000 Subject: [PATCH 3/8] empty From 18cac77d3a42b02f8fedc69384edec32a431bc1a Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 6 Jan 2025 09:46:08 +0000 Subject: [PATCH 4/8] update --- .github/workflows/dependabot-auto-merge.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index c783c7e4e..e442919d4 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,9 +1,9 @@ name: Dependabot auto-merge on: # yamllint disable-line rule:truthy - pull_request_target: - types: - - opened + pull_request: + branches: + - master permissions: contents: write From bf1e2a56ae1f2d980fd8c112a319b9c43507fb75 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 6 Jan 2025 09:56:31 +0000 Subject: [PATCH 5/8] update --- .github/workflows/dependabot-auto-merge.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index e442919d4..2bdd33d62 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,9 +1,6 @@ name: Dependabot auto-merge -on: # yamllint disable-line rule:truthy - pull_request: - branches: - - master +on: pull_request permissions: contents: write @@ -12,7 +9,7 @@ permissions: jobs: auto-merge: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + # if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Enable auto-merge for Dependabot PRs run: gh pr merge --auto --squash "$PR_URL" @@ -22,6 +19,6 @@ jobs: auto-approve: runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} + # if: ${{ github.actor == 'dependabot[bot]' }} steps: - uses: hmarr/auto-approve-action@v4 From b81bced122981167749fd596fc6ad1255dbd9225 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 6 Jan 2025 09:57:37 +0000 Subject: [PATCH 6/8] update --- .github/workflows/dependabot-auto-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 2bdd33d62..855e11e3b 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -9,7 +9,7 @@ permissions: jobs: auto-merge: runs-on: ubuntu-latest - # if: ${{ github.actor == 'dependabot[bot]' }} + if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Enable auto-merge for Dependabot PRs run: gh pr merge --auto --squash "$PR_URL" @@ -19,6 +19,6 @@ jobs: auto-approve: runs-on: ubuntu-latest - # if: ${{ github.actor == 'dependabot[bot]' }} + if: ${{ github.actor == 'dependabot[bot]' }} steps: - uses: hmarr/auto-approve-action@v4 From 5b799f2e7b7cdb78a0f2bb715703043fc6963d38 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 6 Jan 2025 09:58:14 +0000 Subject: [PATCH 7/8] update --- .github/workflows/dependabot-auto-merge.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 855e11e3b..5bef27451 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -11,14 +11,11 @@ jobs: runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} steps: - - name: Enable auto-merge for Dependabot PRs + - name: Enable auto-merge run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - auto-approve: - runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} - steps: - - uses: hmarr/auto-approve-action@v4 + - name: Auto-approve + uses: hmarr/auto-approve-action@v4 From a9d7ce46def59b4dc4195d5b3a14e9f67a991a37 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 6 Jan 2025 09:58:56 +0000 Subject: [PATCH 8/8] update --- .github/workflows/dependabot-auto-merge.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 5bef27451..106d36994 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,6 +1,9 @@ name: Dependabot auto-merge -on: pull_request +on: # yamllint disable-line rule:truthy + pull_request: + branches: + - master permissions: contents: write