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) 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) 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