don't run shfmt in CI

This commit is contained in:
Michael Hobbs
2019-06-11 11:36:17 -07:00
committed by Jose Diaz-Gonzalez
parent d8ada6a6e9
commit f723333a90
2 changed files with 10 additions and 7 deletions

View File

@@ -23,7 +23,7 @@ jobs:
fi
- run: |
case $CIRCLE_NODE_INDEX in
0) sudo -E make -e lint go-tests ci-go-coverage ;;
0) sudo -E make -e lint-ci go-tests ci-go-coverage ;;
1) sudo -E make -e deploy-test-checks-root deploy-test-config ;;
2) sudo -E make -e deploy-test-multi ;;
3) sudo -E make -e deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;

View File

@@ -42,7 +42,7 @@ else
endif
endif
ci-dependencies: bats shellcheck shfmt xmlstarlet
ci-dependencies: bats shellcheck xmlstarlet
setup-deploy-tests:
ifdef ENABLE_DOKKU_TRACE
@@ -80,16 +80,19 @@ lint-setup:
@find . -not -path '*/\.*' -not -path './debian/*' -type f | xargs file | grep text | awk -F ':' '{ print $$1 }' | xargs head -n1 | egrep -B1 "bash" | grep "==>" | awk '{ print $$2 }' > tmp/shellcheck/test-files
@cat tests/shellcheck-exclude | sed -n -e '/^# SC/p' | cut -d' ' -f2 | paste -d, -s > tmp/shellcheck/exclude
lint: lint-setup
# verifying via shfmt
# shfmt -l -bn -ci -i 2 -d .
@shfmt -l -bn -ci -i 2 -d .
lint-ci: lint-setup
# these are disabled due to their expansive existence in the codebase. we should clean it up though
@cat tests/shellcheck-exclude | sed -n -e '/^# SC/p'
@echo linting...
@cat tmp/shellcheck/test-files | xargs shellcheck -e $(shell cat tmp/shellcheck/exclude) | tests/shellcheck-to-junit --output test-results/shellcheck/results.xml --files tmp/shellcheck/test-files --exclude $(shell cat tmp/shellcheck/exclude)
lint-shfmt: shfmt
# verifying via shfmt
# shfmt -l -bn -ci -i 2 -d .
@shfmt -l -bn -ci -i 2 -d .
lint: lint-shfmt lint-ci
ci-go-coverage:
docker run --rm -ti \
-e DOKKU_ROOT=/home/dokku \