From 2003cd527e61017d1d0447b009cc7c68c8d98494 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 12 Jan 2026 18:44:51 +0000 Subject: [PATCH 01/19] [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: v25.12.1 → v26.1.0](https://github.com/ansible-community/ansible-lint/compare/v25.12.1...v26.1.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 255180a..aaa5fd6 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: v25.12.1 + rev: v26.1.0 hooks: - id: ansible-lint name: Ansible-lint From 1e5c2acef3dab95c91e44002fdc39636931e0f10 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 12 Jan 2026 17:34:40 -0500 Subject: [PATCH 02/19] Update GitHub Script action version in workflow --- .github/workflows/manual-pre-commit-merge.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index d02373d..6b59ac5 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -84,16 +84,15 @@ jobs: # This provides transparency about what the workflow is doing - name: Add comment on PR if: steps.check_changes.outputs.only_precommit == 'true' - uses: actions/github-script@main # Allows running custom JavaScript in the workflow + uses: actions/github-script@v8 # Allows running custom JavaScript in the workflow with: - github-token: ${{ secrets.GITHUB_TOKEN }} script: | # Use the GitHub REST API to create a comment on the PR github.rest.issues.createComment({ - issue_number: context.issue.number, # PR number from the event context - owner: context.repo.owner, # Repository owner - repo: context.repo.repo, # Repository name - body: "Auto-approved pre-commit version update. Merging after checks pass." + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Auto-approved pre-commit version update. Merging after checks pass.' }) # Step 6: Wait for all CI/CD checks to complete successfully From 66241efe6c925fdba8e562ef0c122078ea8eaa9f Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 12 Jan 2026 18:08:50 -0500 Subject: [PATCH 03/19] Clarify script section in manual-pre-commit-merge.yml Removed comment about using GitHub REST API for clarity. --- .github/workflows/manual-pre-commit-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index 6b59ac5..c51810c 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -87,7 +87,6 @@ jobs: uses: actions/github-script@v8 # Allows running custom JavaScript in the workflow with: script: | - # Use the GitHub REST API to create a comment on the PR github.rest.issues.createComment({ issue_number: context.issue.number, owner: context.repo.owner, From 59886464bd775775918dc1d1afa7d6bff4174da0 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Thu, 15 Jan 2026 09:33:11 -0500 Subject: [PATCH 04/19] Enhance comments in manual pre-commit merge workflow Refactor comments and improve clarity in the workflow. --- .github/workflows/manual-pre-commit-merge.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index c51810c..20a5773 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -34,13 +34,13 @@ jobs: # This is a security measure to ensure we only auto-merge bot PRs - name: Check PR author id: check_author # Identifier used to reference this step's outputs in later steps + # Compare the actor (PR creator) with the expected bot username + # Set output variable to true if it's the pre-commit bot + # Set output variable to false for any other user/bot run: | - # Compare the actor (PR creator) with the expected bot username if [[ "${{ github.actor }}" == "uk-bolly" ]]; then - # Set output variable to true if it's the pre-commit bot echo "is_precommit_bot=true" >> $GITHUB_OUTPUT else - # Set output variable to false for any other user/bot echo "is_precommit_bot=false" >> $GITHUB_OUTPUT fi @@ -54,21 +54,20 @@ jobs: # Step 3: Verify that ONLY the .pre-commit-config.yaml file was modified # This is a critical safety check to prevent auto-merging unintended changes + # Get the list of files changed between the base branch and the PR head + # origin/${{ github.base_ref }} is the target branch (e.g., main) + # HEAD is the current PR branch + # Check if the ONLY changed file is .pre-commit-config.yaml + # If other files changed, don't auto-merge (requires manual review) - name: Check if only .pre-commit-config.yaml changed if: steps.check_author.outputs.is_precommit_bot == 'true' id: check_changes run: | - # Get the list of files changed between the base branch and the PR head - # origin/${{ github.base_ref }} is the target branch (e.g., main) - # HEAD is the current PR branch changed_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD) - echo "Changed files: $changed_files" # Log for debugging purposes - - # Check if the ONLY changed file is .pre-commit-config.yaml + echo "Changed files: $changed_files" if [[ "$changed_files" == ".pre-commit-config.yaml" ]]; then echo "only_precommit=true" >> $GITHUB_OUTPUT else - # If other files changed, don't auto-merge (requires manual review) echo "only_precommit=false" >> $GITHUB_OUTPUT fi From 67f5d6dd03673afb3ad6403fb8c3327d25a7078a Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Thu, 15 Jan 2026 09:55:47 -0500 Subject: [PATCH 05/19] Update file change check for pre-commit config --- .github/workflows/manual-pre-commit-merge.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index c51810c..589de71 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -54,21 +54,21 @@ jobs: # Step 3: Verify that ONLY the .pre-commit-config.yaml file was modified # This is a critical safety check to prevent auto-merging unintended changes + # Get the list of files changed between the base branch and the PR head + # origin/${{ github.base_ref }} is the target branch (e.g., main) + # HEAD is the current PR branch + # If other files changed, don't auto-merge (requires manual review) + # Check if the ONLY changed file is .pre-commit-config.yaml + - name: Check if only .pre-commit-config.yaml changed if: steps.check_author.outputs.is_precommit_bot == 'true' id: check_changes run: | - # Get the list of files changed between the base branch and the PR head - # origin/${{ github.base_ref }} is the target branch (e.g., main) - # HEAD is the current PR branch - changed_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD) - echo "Changed files: $changed_files" # Log for debugging purposes - - # Check if the ONLY changed file is .pre-commit-config.yaml + changed_files=$(git diff --name-only origin/devel...HEAD) + echo "Changed files: $changed_files" if [[ "$changed_files" == ".pre-commit-config.yaml" ]]; then echo "only_precommit=true" >> $GITHUB_OUTPUT else - # If other files changed, don't auto-merge (requires manual review) echo "only_precommit=false" >> $GITHUB_OUTPUT fi From ebaf69bba5a86c06ad14ac2895260163ef62426d Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Thu, 15 Jan 2026 10:55:04 -0500 Subject: [PATCH 06/19] Downgrade ansible-lint version from v26.1.0 to v25.1.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 aaa5fd6..2dc3f74 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.0 + rev: v25.1.0 hooks: - id: ansible-lint name: Ansible-lint From 41d5e0a9ff86504b67aed32e586fbef12299fcf5 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 19:00:21 +0000 Subject: [PATCH 07/19] [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: v25.1.0 → v26.1.1](https://github.com/ansible-community/ansible-lint/compare/v25.1.0...v26.1.1) - [github.com/adrienverge/yamllint.git: v1.37.1 → v1.38.0](https://github.com/adrienverge/yamllint.git/compare/v1.37.1...v1.38.0) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2dc3f74..2ff7b79 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: v25.1.0 + rev: v26.1.1 hooks: - id: ansible-lint name: Ansible-lint @@ -65,7 +65,7 @@ repos: # - ansible-core>=2.10.1 - repo: https://github.com/adrienverge/yamllint.git - rev: v1.37.1 # or higher tag + rev: v1.38.0 # or higher tag hooks: - id: yamllint name: Check YAML Lint From 5f19e60119872e722ee09efc086b3b627f7815e0 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:22:10 -0500 Subject: [PATCH 08/19] Refactor manual pre-commit merge workflow steps --- .github/workflows/manual-pre-commit-merge.yml | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index 3827323..e75f8aa 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -32,11 +32,12 @@ jobs: steps: # Step 1: Verify that the PR was created by the pre-commit-ci bot # This is a security measure to ensure we only auto-merge bot PRs + # Identifier used to reference this step's outputs in later steps + # Compare the actor (PR creator) with the expected bot username + # Set output variable to true if it's the pre-commit bot + # Set output variable to false for any other user/bot - name: Check PR author - id: check_author # Identifier used to reference this step's outputs in later steps - # Compare the actor (PR creator) with the expected bot username - # Set output variable to true if it's the pre-commit bot - # Set output variable to false for any other user/bot + id: check_author run: | if [[ "${{ github.actor }}" == "uk-bolly" ]]; then echo "is_precommit_bot=true" >> $GITHUB_OUTPUT @@ -46,11 +47,13 @@ jobs: # Step 2: Clone the repository to analyze the changes # This step only runs if the previous step confirmed it's the pre-commit bot + # Use the main branch of the checkout action + # Fetch all history for all branches and tags (needed for git diff) - name: Checkout code if: steps.check_author.outputs.is_precommit_bot == 'true' - uses: actions/checkout@main # Use the main branch of the checkout action + uses: actions/checkout@main with: - fetch-depth: 0 # Fetch all history for all branches and tags (needed for git diff) + fetch-depth: 0 # Step 3: Verify that ONLY the .pre-commit-config.yaml file was modified # This is a critical safety check to prevent auto-merging unintended changes @@ -73,17 +76,19 @@ jobs: # Step 4: Automatically approve the PR # Only runs if all previous checks passed (bot author + only pre-commit config changed) + # Third-party action for PR approval - name: Auto-approve PR if: steps.check_changes.outputs.only_precommit == 'true' - uses: hmarr/auto-approve-action@v4 # Third-party action for PR approval + uses: hmarr/auto-approve-action@v4 with: github-token: ${{ secrets.BOT_PAT }} # Step 5: Add an informative comment to the PR # This provides transparency about what the workflow is doing + # Allows running custom JavaScript in the workflow - name: Add comment on PR if: steps.check_changes.outputs.only_precommit == 'true' - uses: actions/github-script@v8 # Allows running custom JavaScript in the workflow + uses: actions/github-script@v8 with: script: | github.rest.issues.createComment({ @@ -95,22 +100,26 @@ jobs: # Step 6: Wait for all CI/CD checks to complete successfully # This ensures we don't merge a PR that breaks tests or other quality checks + # The commit SHA to check + # Check status every 20 seconds + # Only proceed if all checks succeed (not skipped/neutral) - name: Wait for all checks to pass if: steps.check_changes.outputs.only_precommit == 'true' uses: lewagon/wait-on-check-action@master with: - ref: ${{ github.event.pull_request.head.sha }} # The commit SHA to check + ref: ${{ github.event.pull_request.head.sha }} repo-token: ${{ secrets.BOT_PAT }} - wait-interval: 20 # Check status every 20 seconds - allowed-conclusions: success # Only proceed if all checks succeed (not skipped/neutral) + wait-interval: 20 + allowed-conclusions: success # Step 7: Automatically merge the PR # This is the final step, only executed after all checks pass + # Squash all commits into a single commit on merge - name: Auto-merge PR if: steps.check_changes.outputs.only_precommit == 'true' uses: pascalgn/automerge-action@main env: - GITHUB_TOKEN: ${{ secrets.BOT_PAT }} - MERGE_METHOD: squash # Squash all commits into a single commit on merge + MERGE_METHOD: squash # Other options: merge (creates merge commit), rebase (rebases commits) + From 1ce603b23c5bbd73355789ca30c1865cac46b4b0 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:47:37 -0500 Subject: [PATCH 09/19] Simplify auto-merge workflow by removing wait step Removed the wait step for CI/CD checks before merging a PR. --- .github/workflows/manual-pre-commit-merge.yml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index e75f8aa..95fc706 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -98,21 +98,7 @@ jobs: body: 'Auto-approved pre-commit version update. Merging after checks pass.' }) - # Step 6: Wait for all CI/CD checks to complete successfully - # This ensures we don't merge a PR that breaks tests or other quality checks - # The commit SHA to check - # Check status every 20 seconds - # Only proceed if all checks succeed (not skipped/neutral) - - name: Wait for all checks to pass - if: steps.check_changes.outputs.only_precommit == 'true' - uses: lewagon/wait-on-check-action@master - with: - ref: ${{ github.event.pull_request.head.sha }} - repo-token: ${{ secrets.BOT_PAT }} - wait-interval: 20 - allowed-conclusions: success - - # Step 7: Automatically merge the PR + # Step 6: Automatically merge the PR # This is the final step, only executed after all checks pass # Squash all commits into a single commit on merge - name: Auto-merge PR From 786dc169fe5d0e2f15f9ea64fee33dc88db063fe Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:52:35 -0500 Subject: [PATCH 10/19] Fix formatting in manual-pre-commit-merge.yml --- .github/workflows/manual-pre-commit-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index 95fc706..1ef3727 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -79,7 +79,7 @@ jobs: # Third-party action for PR approval - name: Auto-approve PR if: steps.check_changes.outputs.only_precommit == 'true' - uses: hmarr/auto-approve-action@v4 + uses: hmarr/auto-approve-action@v4 with: github-token: ${{ secrets.BOT_PAT }} @@ -106,6 +106,6 @@ jobs: uses: pascalgn/automerge-action@main env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} - MERGE_METHOD: squash + MERGE_METHOD: squash # Other options: merge (creates merge commit), rebase (rebases commits) From 373304ef05aad9c76945935f2c1fb43e18971f23 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:53:42 -0500 Subject: [PATCH 11/19] Remove empty line in manual-pre-commit-merge.yml --- .github/workflows/manual-pre-commit-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index 1ef3727..8b1a76f 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -108,4 +108,3 @@ jobs: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} MERGE_METHOD: squash # Other options: merge (creates merge commit), rebase (rebases commits) - From debdd9d0c794e24fff39bd5e0a6b643d636dc795 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 09:58:05 -0500 Subject: [PATCH 12/19] Refactor auto-merge workflow for pre-commit updates --- .github/workflows/auto-pre-commit-merge.yml | 64 +++++++++------------ 1 file changed, 28 insertions(+), 36 deletions(-) diff --git a/.github/workflows/auto-pre-commit-merge.yml b/.github/workflows/auto-pre-commit-merge.yml index 3db2213..8e094b9 100644 --- a/.github/workflows/auto-pre-commit-merge.yml +++ b/.github/workflows/auto-pre-commit-merge.yml @@ -32,87 +32,79 @@ jobs: steps: # Step 1: Verify that the PR was created by the pre-commit-ci bot # This is a security measure to ensure we only auto-merge bot PRs + # Identifier used to reference this step's outputs in later steps + # Compare the actor (PR creator) with the expected bot username + # Set output variable to true if it's the pre-commit bot + # Set output variable to false for any other user/bot - name: Check PR author - id: check_author # Identifier used to reference this step's outputs in later steps + id: check_author run: | - # Compare the actor (PR creator) with the expected bot username if [[ "${{ github.actor }}" == "pre-commit-ci[bot]" ]]; then - # Set output variable to true if it's the pre-commit bot echo "is_precommit_bot=true" >> $GITHUB_OUTPUT else - # Set output variable to false for any other user/bot echo "is_precommit_bot=false" >> $GITHUB_OUTPUT fi # Step 2: Clone the repository to analyze the changes # This step only runs if the previous step confirmed it's the pre-commit bot + # Use the main branch of the checkout action + # Fetch all history for all branches and tags (needed for git diff) - name: Checkout code if: steps.check_author.outputs.is_precommit_bot == 'true' - uses: actions/checkout@main # Use the main branch of the checkout action + uses: actions/checkout@main with: - fetch-depth: 0 # Fetch all history for all branches and tags (needed for git diff) + fetch-depth: 0 # Step 3: Verify that ONLY the .pre-commit-config.yaml file was modified # This is a critical safety check to prevent auto-merging unintended changes + # Get the list of files changed between the base branch and the PR head + # origin/${{ github.base_ref }} is the target branch (e.g., main) + # HEAD is the current PR branch + # Check if the ONLY changed file is .pre-commit-config.yaml + # If other files changed, don't auto-merge (requires manual review) - name: Check if only .pre-commit-config.yaml changed if: steps.check_author.outputs.is_precommit_bot == 'true' id: check_changes run: | - # Get the list of files changed between the base branch and the PR head - # origin/${{ github.base_ref }} is the target branch (e.g., main) - # HEAD is the current PR branch - changed_files=$(git diff --name-only origin/${{ github.base_ref }}...HEAD) - echo "Changed files: $changed_files" # Log for debugging purposes - - # Check if the ONLY changed file is .pre-commit-config.yaml + changed_files=$(git diff --name-only origin/devel...HEAD) + echo "Changed files: $changed_files" if [[ "$changed_files" == ".pre-commit-config.yaml" ]]; then echo "only_precommit=true" >> $GITHUB_OUTPUT else - # If other files changed, don't auto-merge (requires manual review) echo "only_precommit=false" >> $GITHUB_OUTPUT fi # Step 4: Automatically approve the PR # Only runs if all previous checks passed (bot author + only pre-commit config changed) + # Third-party action for PR approval - name: Auto-approve PR if: steps.check_changes.outputs.only_precommit == 'true' - uses: hmarr/auto-approve-action@v4 # Third-party action for PR approval + uses: hmarr/auto-approve-action@v4 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + github-token: ${{ secrets.BOT_PAT }} # Step 5: Add an informative comment to the PR # This provides transparency about what the workflow is doing + # Allows running custom JavaScript in the workflow - name: Add comment on PR if: steps.check_changes.outputs.only_precommit == 'true' - uses: actions/github-script@main # Allows running custom JavaScript in the workflow + uses: actions/github-script@v8 with: - github-token: ${{ secrets.BOT_PAT }} script: | - # Use the GitHub REST API to create a comment on the PR github.rest.issues.createComment({ - issue_number: context.issue.number, # PR number from the event context - owner: context.repo.owner, # Repository owner - repo: context.repo.repo, # Repository name - body: "Auto-approved pre-commit version update. Merging after checks pass." + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Auto-approved pre-commit version update. Merging after checks pass.' }) - # Step 6: Wait for all CI/CD checks to complete successfully - # This ensures we don't merge a PR that breaks tests or other quality checks - - name: Wait for all checks to pass - if: steps.check_changes.outputs.only_precommit == 'true' - uses: lewagon/wait-on-check-action@master - with: - ref: ${{ github.event.pull_request.head.sha }} # The commit SHA to check - repo-token: ${{ secrets.BOT_PAT }} - wait-interval: 20 # Check status every 20 seconds - allowed-conclusions: success # Only proceed if all checks succeed (not skipped/neutral) - - # Step 7: Automatically merge the PR + # Step 6: Automatically merge the PR # This is the final step, only executed after all checks pass + # Squash all commits into a single commit on merge - name: Auto-merge PR if: steps.check_changes.outputs.only_precommit == 'true' uses: pascalgn/automerge-action@main env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} - MERGE_METHOD: squash # Squash all commits into a single commit on merge + MERGE_METHOD: squash # Other options: merge (creates merge commit), rebase (rebases commits) From 2cb57734e2f56e58b985f65c957399978fb8bfbd Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 10:33:51 -0500 Subject: [PATCH 13/19] Downgrade ansible-lint version Downgrade ansible-lint version from v26.1.1 to v25.1.1. --- .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..58793aa 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: v25.1.1 hooks: - id: ansible-lint name: Ansible-lint From f7248a963dc7feda7e567b13728d9516bd3ab63f Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 20 Jan 2026 10:35:29 -0500 Subject: [PATCH 14/19] Update ansible-lint version to v26.1.1 --- .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 58793aa..2ff7b79 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: v25.1.1 + rev: v26.1.1 hooks: - id: ansible-lint name: Ansible-lint From 3ceb6113a9276f8255e013987fc60f7c10d9ed53 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 2 Mar 2026 15:03:25 -0500 Subject: [PATCH 15/19] Add merge labels for automerge action --- .github/workflows/auto-pre-commit-merge.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto-pre-commit-merge.yml b/.github/workflows/auto-pre-commit-merge.yml index 8e094b9..e02853a 100644 --- a/.github/workflows/auto-pre-commit-merge.yml +++ b/.github/workflows/auto-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) From 9b7a419b6ea33e440ca25593d41fd640308f7c7c Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Mon, 2 Mar 2026 15:03:45 -0500 Subject: [PATCH 16/19] Configure automerge labels in workflow Added merge labels for automerge 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) From a4aa9571edffb95a444fbfc281a1941a96d9c2ea Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 9 Mar 2026 19:08:11 +0000 Subject: [PATCH 17/19] [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.3.0](https://github.com/ansible-community/ansible-lint/compare/v26.1.1...v26.3.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..b27ea93 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.3.0 hooks: - id: ansible-lint name: Ansible-lint From 47cd768c614bcbe3c5c8fb38e06e1a8369045554 Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 10 Mar 2026 12:59:13 -0400 Subject: [PATCH 18/19] Remove MERGE_REMOVE_LABELS from workflow Removed MERGE_REMOVE_LABELS from automerge action. --- .github/workflows/auto-pre-commit-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/auto-pre-commit-merge.yml b/.github/workflows/auto-pre-commit-merge.yml index e02853a..fd5bffd 100644 --- a/.github/workflows/auto-pre-commit-merge.yml +++ b/.github/workflows/auto-pre-commit-merge.yml @@ -107,6 +107,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} MERGE_LABELS: "automerge" - MERGE_REMOVE_LABELS: "automerge" MERGE_METHOD: "squash" # Other options: merge (creates merge commit), rebase (rebases commits) From ff7e412f67c7a5487bbbc432ac66fcd59da5040f Mon Sep 17 00:00:00 2001 From: Frederick Witty <112580756+frederickw082922@users.noreply.github.com> Date: Tue, 10 Mar 2026 13:01:14 -0400 Subject: [PATCH 19/19] Remove MERGE_REMOVE_LABELS from automerge action Remove the MERGE_REMOVE_LABELS option from automerge action. --- .github/workflows/manual-pre-commit-merge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/manual-pre-commit-merge.yml b/.github/workflows/manual-pre-commit-merge.yml index 962a1a4..843e2ee 100644 --- a/.github/workflows/manual-pre-commit-merge.yml +++ b/.github/workflows/manual-pre-commit-merge.yml @@ -107,6 +107,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.BOT_PAT }} MERGE_LABELS: "automerge" - MERGE_REMOVE_LABELS: "automerge" MERGE_METHOD: "squash" # Other options: merge (creates merge commit), rebase (rebases commits)