Skip to content

Commit

Permalink
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Browse files Browse the repository at this point in the history
  • Loading branch information
mcdonnnj committed Nov 20, 2024
2 parents eafb39f + a794735 commit 623e35a
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ repos:

# Ansible hooks
- repo: https://github.com/ansible/ansible-lint
rev: v24.9.2
rev: v24.10.0
hooks:
- id: ansible-lint
additional_dependencies:
Expand All @@ -176,17 +176,36 @@ repos:
# necessary to add the ansible package itself as an
# additional dependency, with the same pinning as is done in
# requirements-test.txt of cisagov/skeleton-ansible-role.
# - ansible>=9,<10
#
# Version 10 is required because the pip-audit pre-commit
# hook identifies a vulnerability in ansible-core 2.16.13,
# but all versions of ansible 9 have a dependency on
# ~=2.16.X.
#
# It is also a good idea to go ahead and upgrade to version
# 10 since version 9 is going EOL at the end of November:
# https://endoflife.date/ansible
# - ansible>=10,<11
# ansible-core 2.16.3 through 2.16.6 suffer from the bug
# discussed in ansible/ansible#82702, which breaks any
# symlinked files in vars, tasks, etc. for any Ansible role
# installed via ansible-galaxy. Hence we never want to
# install those versions.
#
# Note that the pip-audit pre-commit hook identifies a
# vulnerability in ansible-core 2.16.13. The pin of
# ansible-core to >=2.17 effectively also pins ansible to
# >=10.
#
# It is also a good idea to go ahead and upgrade to
# ansible-core 2.17 since security support for ansible-core
# 2.16 ends this month:
# https://docs.ansible.com/ansible/devel/reference_appendices/release_and_maintenance.html#ansible-core-support-matrix
#
# Note that any changes made to this dependency must also be
# made in requirements.txt in cisagov/skeleton-packer and
# requirements-test.txt in cisagov/skeleton-ansible-role.
- ansible-core>=2.16.7
- ansible-core>=2.17

# Terraform hooks
- repo: https://github.com/antonbabenko/pre-commit-terraform
Expand Down

0 comments on commit 623e35a

Please sign in to comment.