exclude sh tests that require resh to be installed from actions

pull/168/head v2.7.15
Simon Let 4 years ago
parent c0a897d960
commit c7f7b38e7c
No known key found for this signature in database
GPG Key ID: D650C65DD46D431D
  1. 3
      .github/workflows/sh.yaml
  2. 2
      Makefile
  3. 10
      scripts/test.sh

@ -13,8 +13,5 @@ jobs:
- name: Check out code into the Go module directory - name: Check out code into the Go module directory
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Checkout submodules
run: git submodule update --init --recursive
- name: Test - name: Test
run: scripts/test.sh run: scripts/test.sh

@ -14,7 +14,7 @@ install: build
test: test:
go test -v ./... go test -v ./...
go vet ./... go vet ./...
scripts/test.sh scripts/test.sh --all
rebuild: rebuild:
make clean make clean

@ -14,10 +14,12 @@ for f in scripts/{shellrc,util,reshctl,hooks}.sh; do
! zsh -n "$f" && echo "Zsh syntax check failed!" && exit 1 ! zsh -n "$f" && echo "Zsh syntax check failed!" && exit 1
done done
for sh in bash zsh; do if [ "$1" == "--all" ]; then
echo "Running functions in scripts/shellrc.sh using $sh ..." for sh in bash zsh; do
! $sh -c ". scripts/shellrc.sh; __resh_preexec; __resh_precmd" && echo "Error while running functions!" && exit 1 echo "Running functions in scripts/shellrc.sh using $sh ..."
done ! $sh -c ". scripts/shellrc.sh; __resh_preexec; __resh_precmd" && echo "Error while running functions!" && exit 1
done
fi
# TODO: test installation # TODO: test installation

Loading…
Cancel
Save