diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4f8eb6a5..81dbe7e4 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -43,6 +43,8 @@ jobs: make -C main dev-env lint-install - name: Lint Dockerfiles run: make -C main lint-all + - name: Run pre-commit hooks + run: make -C main pre-commit-all - name: Build Docker Images run: make -C main build-test-all - name: Run Post-Build Hooks diff --git a/Makefile b/Makefile index cae82ae2..49adba92 100644 --- a/Makefile +++ b/Makefile @@ -136,10 +136,10 @@ lint-install: ## install hadolint @curl -sL -o $(HADOLINT) "https://github.com/hadolint/hadolint/releases/download/$(HADOLINT_VERSION)/hadolint-$(shell uname -s)-$(shell uname -m)" @chmod 700 $(HADOLINT) @echo "Installation done!" - @$(HADOLINT) --version + @$(HADOLINT) --version pre-commit-all: ## run pre-commit hook on all files - @pre-commit run --all + @pre-commit run --all-files pre-commit-install: ## set up the git hook scripts @pre-commit --version diff --git a/datascience-notebook/hooks/run_hook b/datascience-notebook/hooks/run_hook index f60b8f37..9a68d7d5 100755 --- a/datascience-notebook/hooks/run_hook +++ b/datascience-notebook/hooks/run_hook @@ -75,4 +75,4 @@ $(docker run --rm ${IMAGE_NAME} R --silent -e 'installed.packages(.Library)[, c( \`\`\` $(docker run --rm ${IMAGE_NAME} apt list --installed) \`\`\` -EOF \ No newline at end of file +EOF