From 4d4b717f987ca0b0aeab6996e17ddc810f83fe31 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg Date: Mon, 9 Dec 2024 09:24:48 +0100 Subject: [PATCH] Experiment with automerge on ci update --- templates/github/.github/workflows/update_ci.yml.j2 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/templates/github/.github/workflows/update_ci.yml.j2 b/templates/github/.github/workflows/update_ci.yml.j2 index 2cd84c2a..e914a38f 100644 --- a/templates/github/.github/workflows/update_ci.yml.j2 +++ b/templates/github/.github/workflows/update_ci.yml.j2 @@ -43,6 +43,9 @@ jobs: - name: "Create Pull Request for CI files" uses: "peter-evans/create-pull-request@v6" + {%- if plugin_app_label == "file" %} + id: "create_pr" + {%- endif %} with: token: "{{ '${{ secrets.RELEASE_TOKEN }}' }}" path: "{{ plugin_name }}" @@ -52,5 +55,13 @@ jobs: branch: "update-ci/{{ branch }}" base: "{{ branch }}" delete-branch: true + {%- if plugin_app_label == "file" %} + - name: "Experiment: Mark PR automerge" + run: | + gh pr merge --rebase --auto "${{ steps.create_pr.outputs.pull-request-number }}" + env: + token: "{{ '${{ secrets.RELEASE_TOKEN }}' }}" + continue-on-error: true + {%- endif %} {%- endfor %} ...