Skip to content

Commit 0ae619e

Browse files
authored
Merge branch 'master' into hadolint_and_config
2 parents 5a022c9 + 9260895 commit 0ae619e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
# Skip terraform_tflint which interferes to commit pre-commit auto-fixes
5656
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
5757
with:
58-
python-version: '3.9'
58+
python-version: '3.13'
5959
- name: Execute pre-commit
6060
uses: pre-commit/action@9b88afc9cd57fd75b655d5c71bd38146d07135fe # v2.0.3
6161
env:

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ RUN /install/trivy.sh
8989
RUN . /.env && \
9090
F=tools_versions_info && \
9191
pre-commit --version >> $F && \
92-
(if [ "$OPENTOFU_VERSION" != "false" ]; then echo "./tofu --version | head -n 1" >> $F; else echo "opentofu SKIPPED" >> $F ; fi) && \
93-
(if [ "$TERRAFORM_VERSION" != "false" ]; then echo "./terraform --version | head -n 1" >> $F; else echo "terraform SKIPPED" >> $F ; fi) && \
92+
(if [ "$OPENTOFU_VERSION" != "false" ]; then ./tofu --version | head -n 1 >> $F; else echo "opentofu SKIPPED" >> $F ; fi) && \
93+
(if [ "$TERRAFORM_VERSION" != "false" ]; then ./terraform --version | head -n 1 >> $F; else echo "terraform SKIPPED" >> $F ; fi) && \
94+
9495
\
9596
(if [ "$CHECKOV_VERSION" != "false" ]; then echo "checkov $(checkov --version)" >> $F; else echo "checkov SKIPPED" >> $F ; fi) && \
9697
(if [ "$HCLEDIT_VERSION" != "false" ]; then echo "hcledit $(./hcledit version)" >> $F; else echo "hcledit SKIPPED" >> $F ; fi) && \

0 commit comments

Comments
 (0)