From 5b0c248f9c59d9a50a584958c961ae30c0aa1393 Mon Sep 17 00:00:00 2001 From: Marco Ferrari Date: Tue, 30 Apr 2024 10:07:49 +0000 Subject: [PATCH] fix: no full git validation when ignoring files - Don't require Git SHA and branch validation when IGNORE_GITIGNORED_FILES=true because we only need to validate that the workspace is a Git repository in this case. Fix #5383 --- Makefile | 8 +++++++- test/run-super-linter-tests.sh | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 59bd181e..7d070ddc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ all: info docker test ## Run all targets. .PHONY: test -test: info validate-container-image-labels test-lib inspec lint-codebase test-default-config-files test-actions-runner-debug test-actions-steps-debug test-runner-debug test-find lint-subset-files test-custom-ssl-cert test-non-default-workdir test-git-flags test-non-default-home-directory test-git-initial-commit test-log-level test-linters-expect-failure-log-level-notice test-bash-exec-library-expect-success test-bash-exec-library-expect-failure test-linters ## Run the test suite +test: info validate-container-image-labels test-lib inspec lint-codebase test-default-config-files test-actions-runner-debug test-actions-steps-debug test-runner-debug test-find lint-subset-files test-custom-ssl-cert test-non-default-workdir test-git-flags test-non-default-home-directory test-git-initial-commit test-log-level test-use-find-and-ignore-gitignored-files test-linters-expect-failure-log-level-notice test-bash-exec-library-expect-success test-bash-exec-library-expect-failure test-linters ## Run the test suite # if this session isn't interactive, then we don't want to allocate a # TTY, which would fail, but if it is interactive, we do want to attach @@ -379,6 +379,12 @@ test-git-initial-commit: ## Run super-linter against a repository that only has $(SUPER_LINTER_TEST_CONTAINER_URL) \ "run_test_case_git_initial_commit" +.PHONY: test-use-find-and-ignore-gitignored-files +test-use-find-and-ignore-gitignored-files: ## Run super-linter with USE_FIND_ALGORITHM=true and IGNORE_GITIGNORED_FILES=true + $(CURDIR)/test/run-super-linter-tests.sh \ + $(SUPER_LINTER_TEST_CONTAINER_URL) \ + "run_test_case_use_find_and_ignore_gitignored_files" + .PHONY: build-dev-container-image build-dev-container-image: ## Build commit linter container image DOCKER_BUILDKIT=1 docker buildx build --load \ diff --git a/test/run-super-linter-tests.sh b/test/run-super-linter-tests.sh index cdf5feb9..0ab0448f 100755 --- a/test/run-super-linter-tests.sh +++ b/test/run-super-linter-tests.sh @@ -79,6 +79,12 @@ run_test_case_git_initial_commit() { COMMAND_TO_RUN+=(-e VALIDATE_JSON=true) } +run_test_case_use_find_and_ignore_gitignored_files() { + COMMAND_TO_RUN+=(-e IGNORE_GITIGNORED_FILES=true) + COMMAND_TO_RUN+=(-e USE_FIND_ALGORITHM=true) + SUPER_LINTER_WORKSPACE="$(pwd)/.github" +} + # Run the test setup function ${TEST_FUNCTION_NAME}