From 22e6a9e4be829d819a8023a68c09c99fe56a5836 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 04:24:24 +0000 Subject: [PATCH 1/6] Bump tj-actions/changed-files from 41 to 45 Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 41 to 45. - [Release notes](https://github.com/tj-actions/changed-files/releases) - [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md) - [Commits](https://github.com/tj-actions/changed-files/compare/v41...v45) --- updated-dependencies: - dependency-name: tj-actions/changed-files dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/documentation.yml | 2 +- .github/workflows/latest_testing.yml | 2 +- .github/workflows/prev_testing.yml | 2 +- .github/workflows/testing.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b7409140f..0270ffa25 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -20,7 +20,7 @@ jobs: # Skip workflow if only certain files have been changed. - name: Get changed files id: changed-files-specific - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v45 with: files: | examples/** diff --git a/.github/workflows/latest_testing.yml b/.github/workflows/latest_testing.yml index 4c0ddab87..72ad27fcf 100644 --- a/.github/workflows/latest_testing.yml +++ b/.github/workflows/latest_testing.yml @@ -20,7 +20,7 @@ jobs: # Skip workflow if only certain files have been changed. - name: Get changed files id: changed-files-specific - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v45 with: files: | docs/** diff --git a/.github/workflows/prev_testing.yml b/.github/workflows/prev_testing.yml index 92c341d5d..52c807eff 100644 --- a/.github/workflows/prev_testing.yml +++ b/.github/workflows/prev_testing.yml @@ -25,7 +25,7 @@ jobs: # Skip workflow if only certain files have been changed. - name: Get changed files id: changed-files-specific - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v45 with: files: | docs/** diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e003cfb78..61b9cee6e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -20,7 +20,7 @@ jobs: # Skip workflow if only certain files have been changed. - name: Get changed files id: changed-files-specific - uses: tj-actions/changed-files@v41 + uses: tj-actions/changed-files@v45 with: files: | docs/** From 884550d04dec76e782b116f5d2012b44e6614528 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 05:16:20 +0000 Subject: [PATCH 2/6] Squash instead of merge --- .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 51bf9bd35..e136abb3e 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -15,7 +15,7 @@ jobs: if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 2526c8e75c90e8fccdf69a05041e46f587779390 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 05:32:39 +0000 Subject: [PATCH 3/6] try --- .github/workflows/dependabot-auto-merge.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index e136abb3e..ba9fd166f 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -1,7 +1,7 @@ name: Dependabot auto-merge on: # yamllint disable-line rule:truthy - pull_request: + pull_request_target: branches: - master @@ -10,7 +10,7 @@ permissions: pull-requests: write jobs: - dependabot: + auto-merge: runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' }} steps: @@ -19,3 +19,11 @@ jobs: env: PR_URL: ${{github.event.pull_request.html_url}} GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + auto-approve: + runs-on: ubuntu-latest + permissions: + pull-requests: write + if: github.actor == 'dependabot[bot]' + steps: + - uses: hmarr/auto-approve-action@v4 From d22cde53576fa0348f96f787cc4bfa5a104ecec0 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 05:36:22 +0000 Subject: [PATCH 4/6] try --- .github/workflows/dependabot-auto-merge.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index ba9fd166f..86e7c893b 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -27,3 +27,8 @@ jobs: if: github.actor == 'dependabot[bot]' steps: - uses: hmarr/auto-approve-action@v4 + with: + github_token: ${{secrets.GITHUB_TOKEN}} + auto_merge: true + auto_merge_method: squash + review_message: "Auto approved automated PR" From ca27daa2d1dd992cf457cdb12cb91813a01b20b0 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 05:37:27 +0000 Subject: [PATCH 5/6] try --- .github/workflows/dependabot-auto-merge.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 86e7c893b..ba9fd166f 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -27,8 +27,3 @@ jobs: if: github.actor == 'dependabot[bot]' steps: - uses: hmarr/auto-approve-action@v4 - with: - github_token: ${{secrets.GITHUB_TOKEN}} - auto_merge: true - auto_merge_method: squash - review_message: "Auto approved automated PR" From 5c7edcf81507a9f648570682bdaa53a1e6e32326 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 5 Jan 2025 05:38:03 +0000 Subject: [PATCH 6/6] try --- .github/workflows/dependabot-auto-merge.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index ba9fd166f..9ec6fd55a 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -22,8 +22,6 @@ jobs: auto-approve: runs-on: ubuntu-latest - permissions: - pull-requests: write if: github.actor == 'dependabot[bot]' steps: - uses: hmarr/auto-approve-action@v4