Only check scripts on linux and don't double lint

This commit is contained in:
Alex Dadgar
2017-10-19 14:21:17 -07:00
parent 34af514b3c
commit c231089cfd
4 changed files with 6 additions and 2 deletions

View File

@@ -192,7 +192,7 @@ dev: GOOS=$(shell go env GOOS)
dev: GOARCH=$(shell go env GOARCH)
dev: GOPATH=$(shell go env GOPATH)
dev: DEV_TARGET=pkg/$(GOOS)_$(GOARCH)$(if $(HAS_LXC),-lxc)/nomad
dev: check ## Build for the current development platform
dev: ## Build for the current development platform
@echo "==> Removing old development build..."
@rm -f $(PROJECT_ROOT)/$(DEV_TARGET)
@rm -f $(PROJECT_ROOT)/bin/nomad

View File

@@ -1,5 +1,7 @@
#!/usr/bin/env bash
set -o errexit
apt-get update
apt-get install -y liblxc1 lxc-dev lxc shellcheck
apt-get install -y qemu

View File

@@ -1,4 +1,6 @@
#!/usr/bin/env bash
set -o errexit
bash ./scripts/travis-consul.sh
bash ./scripts/travis-vault.sh

View File

@@ -8,7 +8,7 @@ PING_LOOP_PID=$!
trap 'kill ${PING_LOOP_PID}' EXIT HUP INT QUIT TERM
make check
make checkscripts
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make checkscripts ; fi
make test
TEST_OUTPUT=$?