diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index bab04f4..0000000 --- a/.tool-versions +++ /dev/null @@ -1,12 +0,0 @@ -adr-tools 3.0.0 -awscli 2.13.11 -checkov 2.4.5 -golang 1.21.0 -golangci-lint 1.54.2 -pre-commit 3.3.3 -terraform 1.5.5 -terraform-docs 0.16.0 -tflint 0.47.0 -tfsec 1.28.1 -# renovate: datasource=github-tags depName=defenseunicorns/zarf -zarf 0.29.0 diff --git a/Makefile b/Makefile index 46f2d6e..824d589 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ _test-all: _create-folders -e SKIP_TEARDOWN \ ${BUILD_HARNESS_REPO}:${BUILD_HARNESS_VERSION} \ bash -c 'git config --global --add safe.directory /app \ - && asdf install && cd examples/complete \ + && cd examples/complete \ && terraform init -upgrade=true \ && cd ../../test/e2e \ && go test -count 1 -v $(EXTRA_TEST_ARGS) .' @@ -102,7 +102,7 @@ _runhooks: _create-folders -e "SKIP=$(SKIP)" \ -e "PRE_COMMIT_HOME=/app/.cache/pre-commit" \ ${BUILD_HARNESS_REPO}:${BUILD_HARNESS_VERSION} \ - bash -c 'git config --global --add safe.directory /app && asdf install && pre-commit run -a --show-diff-on-failure $(HOOK)' + bash -c 'git config --global --add safe.directory /app && pre-commit run -a --show-diff-on-failure $(HOOK)' .PHONY: pre-commit-all pre-commit-all: ## Run all pre-commit hooks. Returns nonzero exit code if any hooks fail. Uses Docker for maximum compatibility