@@ -60,18 +60,14 @@ functions:
60
60
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
61
61
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
62
62
export UPLOAD_BUCKET="${project}"
63
- export PATH="${GCC_PATH}:$GOPATH/bin:$MONGODB_BINARIES:$PATH"
63
+ export PATH="${GO_DIST}/bin:${ GCC_PATH}:$GOPATH/bin:$MONGODB_BINARIES:$PATH"
64
64
export PROJECT="${project}"
65
65
66
66
if [ "Windows_NT" = "$OS" ]; then
67
67
export USERPROFILE=$(cygpath -w $(dirname $(dirname $(dirname $(dirname `pwd`)))))
68
68
export HOME=$(cygpath -w $(dirname $(dirname $(dirname $(dirname `pwd`)))))
69
69
fi
70
70
71
- go get -u github.com/andrewkroh/gvm
72
- eval "$(gvm -f bash 1.9.5)"
73
- gvm -f bash 1.9.5
74
-
75
71
go version
76
72
go env
77
73
@@ -86,7 +82,7 @@ functions:
86
82
set -o errexit
87
83
set -o xtrace
88
84
export GOPATH="$GOPATH"
89
- export GOROOT="$GOROOT "
85
+ export GOROOT="${GO_DIST} "
90
86
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
91
87
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
92
88
export MONGODB_BINARIES="$MONGODB_BINARIES"
@@ -542,22 +538,29 @@ axes:
542
538
- id : " windows-64"
543
539
display_name : " Windows 64-bit"
544
540
run_on :
545
- - windows-64-vs2015-large
541
+ - windows-64-vs2015-test
546
542
variables :
547
543
GCC_PATH : " /cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin"
544
+ GO_DIST : " C:\\ golang\\ go1.9.5"
548
545
- id : " ubuntu1604-64"
549
546
display_name : " Ubuntu 16.04"
550
547
run_on : ubuntu1604-build
548
+ variables :
549
+ GO_DIST : " /opt/golang/go1.9"
551
550
- id : osx
552
551
display_name : " MacOS 10.12"
553
552
run_on : macos-1012
553
+ variables :
554
+ GO_DIST : " /opt/golang/go1.9"
554
555
555
556
556
557
buildvariants :
557
558
- name : static-analysis
558
559
display_name : " Static Analysis"
559
560
run_on :
560
561
- ubuntu1604-build
562
+ expansions :
563
+ GO_DIST : " /opt/golang/go1.9"
561
564
tasks :
562
565
- name : " .static-analysis"
563
566
0 commit comments