Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

travis.yml, hack: fix tests on tip #2097

Merged
merged 1 commit into from
Jan 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
- npm install -g codeclimate-test-reporter
env:
- DEPTESTBYPASS501=1
- TZ=UTC
os: linux
go: 1.11.x
script:
Expand All @@ -29,11 +30,20 @@ jobs:
- ssh-keyscan -t $TRAVIS_SSH_KEY_TYPES -H bitbucket.org >> ~/.ssh/known_hosts
env:
- DEPTESTBYPASS501=1
- TZ=UTC
script: make test
- <<: *simple-test
go: 1.9.x
- <<: *simple-test
go: tip
install:
- ssh-keyscan -t $TRAVIS_SSH_KEY_TYPES -H bitbucket.org >> ~/.ssh/known_hosts
- mkdir -p /home/travis/var/cache
env:
- GOCACHE=/home/travis/var/cache
- DEPTESTBYPASS501=1
- TZ=UTC

- <<: *simple-test
os: osx
go: 1.11.x
Expand All @@ -45,6 +55,7 @@ jobs:
env:
- HOMEBREW_NO_AUTO_UPDATE=1
- DEPTESTBYPASS501=1
- TZ=UTC
script:
# OSX as of El Capitan sets an exit trap that interacts poorly with how
# travis seems to spawn these shells; if set -e is set, then it can cause
Expand Down
7 changes: 2 additions & 5 deletions hack/coverage.bash
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
#
# This script will generate coverage.txt
# This script will generate coverage.txt.

if [[ "${CI:-}" != 'true' ]]; then
# https://github.com/golang/dep/issues/2089
set -e
fi
set -e

PKGS=$(go list ./... | grep -v /vendor/)
for pkg in $PKGS; do
Expand Down
5 changes: 1 addition & 4 deletions hack/test.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
# DEP_BUILD_PLATFORMS="linux" DEP_BUILD_ARCHS="amd64" ./hack/build-all.bash
# can be called to build only for linux-amd64

if [[ "${CI:-}" != 'true' ]]; then
# https://github.com/golang/dep/issues/2089
set -e
fi
set -e

IMPORT_DURING_SOLVE=${IMPORT_DURING_SOLVE:-false}

Expand Down