Skip to content

Commit f7d91df

Browse files
author
Nick Silkey
committed
Bump golang version to 1.10
Allows local builds in golang 1.10 on OS X to work. Done as part of needing a new spin for new OS X version (10.13). This also wraps the version marker in the Travis CI yaml per a known bug (travis-ci/travis-ci#9247) where the version marker was being trapped as 1.1.
1 parent 0141d25 commit f7d91df

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
language: go
22

33
go:
4-
- 1.4
4+
# Done as part of https://github.com/travis-ci/travis-ci/issues/9247
5+
- "1.10"
56

67
sudo: false
78

@@ -18,7 +19,7 @@ before_install:
1819
- curl -o gimme -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
1920
- chmod u+x gimme
2021
- unset GOROOT GOTOOLDIR
21-
- eval "$(./gimme 1.4)"
22+
- eval "$(./gimme 1.10)"
2223
- go version
2324
- go env
2425

script/build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ build() {
1515

1616
# Check the go version
1717
EQ="="
18-
regex="(go[0-1].[0-4])"
18+
# If we are golang <= 1.4, ' ' for EQ ... else '='
19+
regex="(go[0-1].[0-4](?![0-9]))"
1920
if [[ `go version` =~ $regex ]]; then
2021
EQ=" "
2122
fi

0 commit comments

Comments
 (0)