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