From 7b951b5ea7c59118ce9d0d8296587da48620b3dc Mon Sep 17 00:00:00 2001 From: Marius Ghita Date: Tue, 21 Jan 2025 01:00:42 +0200 Subject: [PATCH] style: dependabot auto-merge workflow #9358 --- tasks/generate-files.yaml | 6 ++++-- ...pendabot-prs.yaml => auto-merge-dependabot-prs.yaml.j2} | 7 +++---- 2 files changed, 7 insertions(+), 6 deletions(-) rename templates/.github/workflows/{auto-merge-dependabot-prs.yaml => auto-merge-dependabot-prs.yaml.j2} (78%) diff --git a/tasks/generate-files.yaml b/tasks/generate-files.yaml index a7f47ba..cfc471c 100644 --- a/tasks/generate-files.yaml +++ b/tasks/generate-files.yaml @@ -31,9 +31,11 @@ variable_end_string: ']]' - name: Generate dependabot automerge workflow - ansible.builtin.copy: - src: ./templates/.github/workflows/auto-merge-dependabot-prs.yaml + ansible.builtin.template: + src: ./templates/.github/workflows/auto-merge-dependabot-prs.yaml.j2 dest: "{{ repo_path }}/.github/workflows/auto-merge-dependabot-prs.yaml" + variable_start_string: '[[' + variable_end_string: ']]' when: repo.github.features.dependabot_auto_merge - name: Generate CODEOWNERS file diff --git a/templates/.github/workflows/auto-merge-dependabot-prs.yaml b/templates/.github/workflows/auto-merge-dependabot-prs.yaml.j2 similarity index 78% rename from templates/.github/workflows/auto-merge-dependabot-prs.yaml rename to templates/.github/workflows/auto-merge-dependabot-prs.yaml.j2 index ce97a2a..af0729b 100644 --- a/templates/.github/workflows/auto-merge-dependabot-prs.yaml +++ b/templates/.github/workflows/auto-merge-dependabot-prs.yaml.j2 @@ -1,3 +1,4 @@ +# [[ repo_managed ]] name: Auto-merge Dependabot PRs on: pull_request_target @@ -10,12 +11,10 @@ jobs: runs-on: ubuntu-latest if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }} steps: - - name: Dependabot metadata - id: metadata + - id: metadata uses: dependabot/fetch-metadata@v2 - - name: Enable auto-merge for Dependabot PRs - if: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' + - if: steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch' run: gh pr merge --merge "$PR_URL" env: PR_URL: ${{ github.event.pull_request.html_url }}