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

Commit

Permalink
Merge pull request #1663 from endocode/dongsu/travis-go17-gopath
Browse files Browse the repository at this point in the history
travis,functional: add go 1.7 and exclude ./gopath
  • Loading branch information
Dongsu Park authored Aug 17, 2016
2 parents bb930db + 1ff7017 commit 53ba925
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ matrix:
- go: 1.5.4
env: GO15VENDOREXPERIMENT=1
- go: 1.6.3
- go: 1.7
- go: tip
allow_failures:
- go: tip
Expand Down
2 changes: 1 addition & 1 deletion functional/provision/install_go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ HOME=$(getent passwd "${USER_ID}" | cut -d: -f6)
export GOROOT=${HOME}/go
export PATH=${HOME}/go/bin:${PATH}

gover=1.6.3
gover=1.7
gotar=go${gover}.linux-amd64.tar.gz
if [ ! -f ${HOME}/${gotar} ]; then
# Remove unfinished archive when you press Ctrl+C
Expand Down
2 changes: 1 addition & 1 deletion test
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if [ -n "${vetRes}" ]; then
fi

echo "Checking for license header..."
licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*'); do
licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*' ! -path './gopath/*' ); do
head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e " ${file}"
done;)
if [ -n "${licRes}" ]; then
Expand Down

0 comments on commit 53ba925

Please sign in to comment.