Skip to content

Commit 604eb85

Browse files
committed
Upgrade Evergreen to run Go 1.10 and 1.11
GODRIVER-536 Change-Id: Ic5f1ce67b92a2d30b8ca9dd7742e60ef0fa99b56
1 parent 518f224 commit 604eb85

File tree

1 file changed

+21
-9
lines changed

1 file changed

+21
-9
lines changed

.evergreen/config.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ functions:
119119
script: |
120120
${PREPARE_SHELL}
121121
# any go tools that we need
122-
go get -u github.com/golang/lint/golint
122+
go get -u golang.org/x/lint/golint
123123
go get -u github.com/kisielk/errcheck
124124
125125
# initialize submodules
@@ -261,7 +261,9 @@ functions:
261261
else
262262
export GOPATH=$(dirname $(dirname $(dirname $(dirname `pwd`))))
263263
fi;
264-
export PATH="${GCC_PATH}:$PATH"
264+
export GOPATH="$GOPATH"
265+
export GOROOT="${GO_DIST}"
266+
export PATH="${GCC_PATH}:${GO_DIST}/bin:$PATH"
265267
MONGODB_URI="${MONGODB_URI}" MONGO_GO_DRIVER_COMPRESSOR="${MONGO_GO_DRIVER_COMPRESSOR}" make -s evg-test-auth
266268
267269
run-enterprise-gssapi-auth-tests:
@@ -284,7 +286,9 @@ functions:
284286
kinit -k -t ${PROJECT_DIRECTORY}/.evergreen/drivers.keytab -p "${gssapi_auth_username}"
285287
export MONGODB_URI="${gssapi_auth_linux_mongodb_uri}"
286288
fi;
287-
export PATH="${GCC_PATH}:$PATH"
289+
export GOPATH="$GOPATH"
290+
export GOROOT="${GO_DIST}"
291+
export PATH="${GCC_PATH}:${GO_DIST}/bin:$PATH"
288292
MONGO_GO_DRIVER_COMPRESSOR="${MONGO_GO_DRIVER_COMPRESSOR}" make -s evg-test-auth
289293
290294
pre:
@@ -557,6 +561,14 @@ tasks:
557561
targets: "build"
558562
BUILD_ENV: "PATH=/opt/golang/go1.8/bin:$PATH GOROOT=/opt/golang/go1.8"
559563

564+
- name: go1.10-build
565+
tags: ["compile-check"]
566+
commands:
567+
- func: run-make
568+
vars:
569+
targets: "build"
570+
BUILD_ENV: "PATH=/opt/golang/go1.10/bin:$PATH GOROOT=/opt/golang/go1.10"
571+
560572
- name: linux-32-bit
561573
tags: ["compile-check"]
562574
commands:
@@ -609,23 +621,23 @@ axes:
609621
- id: os
610622
display_name: OS
611623
values:
612-
- id: "windows-64"
624+
- id: "windows-64-go-1-11"
613625
display_name: "Windows 64-bit"
614626
run_on:
615627
- windows-64-vs2015-test
616628
variables:
617629
GCC_PATH: "/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin"
618-
GO_DIST: "C:\\golang\\go1.9.5"
619-
- id: "ubuntu1604-64"
630+
GO_DIST: "C:\\golang\\go1.11"
631+
- id: "ubuntu1604-64-go-1-11"
620632
display_name: "Ubuntu 16.04"
621633
run_on: ubuntu1604-build
622634
variables:
623-
GO_DIST: "/opt/golang/go1.9"
624-
- id: osx
635+
GO_DIST: "/opt/golang/go1.11"
636+
- id: "osx-go-1-11"
625637
display_name: "MacOS 10.12"
626638
run_on: macos-1012
627639
variables:
628-
GO_DIST: "/opt/golang/go1.9"
640+
GO_DIST: "/opt/golang/go1.11"
629641

630642

631643
buildvariants:

0 commit comments

Comments
 (0)