diff --git a/.copier-answers.yml b/.copier-answers.yml index f7d8b29..945d5ca 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,4 +1,4 @@ # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY -_commit: v2.4.1 +_commit: v2.4.3 _src_path: https://github.com/dafyddj/copier-bootstrap template_name: copier-packer-build diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 3220412..c759f05 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,6 +7,7 @@ "extends": [ "config:recommended", ], + "automergeStrategy": "merge-commit", "git-submodules": { "enabled": true }, diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c2ddaf..7c45d3d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -68,7 +68,7 @@ jobs: checks: read runs-on: ubuntu-latest steps: - - uses: poseidon/wait-for-status-checks@6988432d64ad3f9c2608db4ca16fded1b7d36ead # v0.5.0 + - uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0 with: ignore: Collect results token: ${{ secrets.GITHUB_TOKEN }} diff --git a/template/.github/renovate.json5 b/template/.github/renovate.json5 index 3220412..c759f05 100644 --- a/template/.github/renovate.json5 +++ b/template/.github/renovate.json5 @@ -7,6 +7,7 @@ "extends": [ "config:recommended", ], + "automergeStrategy": "merge-commit", "git-submodules": { "enabled": true },