diff --git a/.github/workflows/sh.yaml b/.github/workflows/sh.yaml index 6b86281..fdd34f5 100644 --- a/.github/workflows/sh.yaml +++ b/.github/workflows/sh.yaml @@ -13,8 +13,5 @@ jobs: - name: Check out code into the Go module directory uses: actions/checkout@v2 - - name: Checkout submodules - run: git submodule update --init --recursive - - name: Test run: scripts/test.sh diff --git a/Makefile b/Makefile index 02bb7e0..3dcf6fa 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ install: build test: go test -v ./... go vet ./... - scripts/test.sh + scripts/test.sh --all rebuild: make clean diff --git a/scripts/test.sh b/scripts/test.sh index 34fa3e0..6c23446 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -14,10 +14,12 @@ for f in scripts/{shellrc,util,reshctl,hooks}.sh; do ! zsh -n "$f" && echo "Zsh syntax check failed!" && exit 1 done -for sh in bash zsh; do - echo "Running functions in scripts/shellrc.sh using $sh ..." - ! $sh -c ". scripts/shellrc.sh; __resh_preexec; __resh_precmd" && echo "Error while running functions!" && exit 1 -done +if [ "$1" == "--all" ]; then + for sh in bash zsh; do + echo "Running functions in scripts/shellrc.sh using $sh ..." + ! $sh -c ". scripts/shellrc.sh; __resh_preexec; __resh_precmd" && echo "Error while running functions!" && exit 1 + done +fi # TODO: test installation