diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 51bf9bd3..9ec6fd55 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,12 +10,18 @@ permissions: pull-requests: write jobs: - dependabot: + auto-merge: runs-on: ubuntu-latest 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}} + + auto-approve: + runs-on: ubuntu-latest + if: github.actor == 'dependabot[bot]' + steps: + - uses: hmarr/auto-approve-action@v4 diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index b7409140..0270ffa2 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 4c0ddab8..72ad27fc 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 92c341d5..52c807ef 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 e003cfb7..61b9cee6 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/**