Fix CI after make introduction

This commit is contained in:
Joel Speed 2019-01-04 11:07:45 +00:00
parent 372ecd0cf8
commit eded761cc1
No known key found for this signature in database
GPG Key ID: 6E80578D6751DEFB
2 changed files with 3 additions and 2 deletions

View File

@ -6,6 +6,7 @@ install:
# Fetch dependencies # Fetch dependencies
- wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 - wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64
- chmod +x dep - chmod +x dep
- mv dep /usr/local/bin/dep
script: script:
- ./configure - ./configure
# Run tests # Run tests

4
configure vendored
View File

@ -81,7 +81,7 @@ check_for() {
check_go_version() { check_go_version() {
echo -n "Checking go version... " echo -n "Checking go version... "
GO_VERSION=$(${tools[go]} version | ${tools[awk]} '{where = match($0, /[0-9]\.[0-9]+\.[0-9]*/); if (where != 0) print substr($0, RSTART, RLENGTH)}') GO_VERSION=$(${tools[go]} version | ${tools[awk]} '{where = match($0, /[0-9]\.[0-9]+\.[0-9]*/); if (where != 0) print substr($0, RSTART, RLENGTH)}')
vercomp $GO_VERSION 1.10 vercomp $GO_VERSION 1.9
case $? in case $? in
0) ;& 0) ;&
1) 1)
@ -91,7 +91,7 @@ check_go_version() {
;; ;;
2) 2)
printf "${RED}" printf "${RED}"
echo "$GO_VERSION < 1.10" echo "$GO_VERSION < 1.9"
exit 1 exit 1
;; ;;
esac esac