From a37b4f1146b23459e7fa0bfc2ca7e25e913f131b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 2 Mar 2026 19:03:57 +0000 Subject: [PATCH 1/4] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/ansible-community/ansible-lint: v26.1.1 → v26.2.0](https://github.com/ansible-community/ansible-lint/compare/v26.1.1...v26.2.0) --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2ff7b79..afc050c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: - id: gitleaks - repo: https://github.com/ansible-community/ansible-lint - rev: v26.1.1 + rev: v26.2.0 hooks: - id: ansible-lint name: Ansible-lint From 49097fceb23b1ec58ff4564bf6bc9e8209dcf6b3 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 2 Mar 2026 14:21:39 -0500 Subject: [PATCH 2/4] Add MERGE_LABELS to auto-pre-commit-merge.yml --- .github/workflows/auto-pre-commit-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto-pre-commit-merge.yml b/.github/workflows/auto-pre-commit-merge.yml index 8e094b9..ba3f947 100644 --- a/.github/workflows/auto-pre-commit-merge.yml +++ b/.github/workflows/auto-pre-commit-merge.yml @@ -107,4 +107,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} MERGE_METHOD: squash + MERGE_LABELS: "" # Other options: merge (creates merge commit), rebase (rebases commits) From 54699ef3d0060d38a57d14bfc49ce5ed7b3a63c7 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 2 Mar 2026 14:33:46 -0500 Subject: [PATCH 3/4] Update automerge action configuration --- .github/workflows/auto-pre-commit-merge.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto-pre-commit-merge.yml b/.github/workflows/auto-pre-commit-merge.yml index ba3f947..e02853a 100644 --- a/.github/workflows/auto-pre-commit-merge.yml +++ b/.github/workflows/auto-pre-commit-merge.yml @@ -106,6 +106,7 @@ jobs: uses: pascalgn/automerge-action@main env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} - MERGE_METHOD: squash - MERGE_LABELS: "" + MERGE_LABELS: "automerge" + MERGE_REMOVE_LABELS: "automerge" + MERGE_METHOD: "squash" # Other options: merge (creates merge commit), rebase (rebases commits) From b723c84a87f2d56e495bcf8f0b22b3b4f3292ef2 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 2 Mar 2026 14:35:14 -0500 Subject: [PATCH 4/4] Add automerge labels to pre-commit merge workflow Added automerge labels to the merge action. --- .github/workflows/manual-pre-commit-merge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index 8b1a76f..962a1a4 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -106,5 +106,7 @@ jobs: uses: pascalgn/automerge-action@main env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} - MERGE_METHOD: squash + MERGE_LABELS: "automerge" + MERGE_REMOVE_LABELS: "automerge" + MERGE_METHOD: "squash" # Other options: merge (creates merge commit), rebase (rebases commits)