don't run shfmt in CI
This commit is contained in:
committed by
Jose Diaz-Gonzalez
parent
d8ada6a6e9
commit
f723333a90
@@ -23,7 +23,7 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
- run: |
|
- run: |
|
||||||
case $CIRCLE_NODE_INDEX in
|
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 ;;
|
1) sudo -E make -e deploy-test-checks-root deploy-test-config ;;
|
||||||
2) sudo -E make -e deploy-test-multi ;;
|
2) sudo -E make -e deploy-test-multi ;;
|
||||||
3) sudo -E make -e deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
|
3) sudo -E make -e deploy-test-go-fail-predeploy deploy-test-go-fail-postdeploy ;;
|
||||||
|
|||||||
15
tests.mk
15
tests.mk
@@ -42,7 +42,7 @@ else
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ci-dependencies: bats shellcheck shfmt xmlstarlet
|
ci-dependencies: bats shellcheck xmlstarlet
|
||||||
|
|
||||||
setup-deploy-tests:
|
setup-deploy-tests:
|
||||||
ifdef ENABLE_DOKKU_TRACE
|
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
|
@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
|
@cat tests/shellcheck-exclude | sed -n -e '/^# SC/p' | cut -d' ' -f2 | paste -d, -s > tmp/shellcheck/exclude
|
||||||
|
|
||||||
lint: lint-setup
|
lint-ci: lint-setup
|
||||||
# verifying via shfmt
|
|
||||||
# shfmt -l -bn -ci -i 2 -d .
|
|
||||||
@shfmt -l -bn -ci -i 2 -d .
|
|
||||||
|
|
||||||
# these are disabled due to their expansive existence in the codebase. we should clean it up though
|
# 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'
|
@cat tests/shellcheck-exclude | sed -n -e '/^# SC/p'
|
||||||
@echo linting...
|
@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)
|
@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:
|
ci-go-coverage:
|
||||||
docker run --rm -ti \
|
docker run --rm -ti \
|
||||||
-e DOKKU_ROOT=/home/dokku \
|
-e DOKKU_ROOT=/home/dokku \
|
||||||
|
|||||||
Reference in New Issue
Block a user