Skip to content

Commit f4f4c7b

Browse files
Sam Kleinmantychoish
authored andcommitted
GODRIVER-384: use native go runtime environment
Change-Id: If34d5f81c0dfca3b3de614008474b8e97352a638
1 parent 8fc91aa commit f4f4c7b

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.evergreen/config.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,14 @@ functions:
6060
export MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
6161
export MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
6262
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"
6464
export PROJECT="${project}"
6565
6666
if [ "Windows_NT" = "$OS" ]; then
6767
export USERPROFILE=$(cygpath -w $(dirname $(dirname $(dirname $(dirname `pwd`)))))
6868
export HOME=$(cygpath -w $(dirname $(dirname $(dirname $(dirname `pwd`)))))
6969
fi
7070
71-
go get -u github.com/andrewkroh/gvm
72-
eval "$(gvm -f bash 1.9.5)"
73-
gvm -f bash 1.9.5
74-
7571
go version
7672
go env
7773
@@ -86,7 +82,7 @@ functions:
8682
set -o errexit
8783
set -o xtrace
8884
export GOPATH="$GOPATH"
89-
export GOROOT="$GOROOT"
85+
export GOROOT="${GO_DIST}"
9086
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
9187
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
9288
export MONGODB_BINARIES="$MONGODB_BINARIES"
@@ -542,22 +538,29 @@ axes:
542538
- id: "windows-64"
543539
display_name: "Windows 64-bit"
544540
run_on:
545-
- windows-64-vs2015-large
541+
- windows-64-vs2015-test
546542
variables:
547543
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"
548545
- id: "ubuntu1604-64"
549546
display_name: "Ubuntu 16.04"
550547
run_on: ubuntu1604-build
548+
variables:
549+
GO_DIST: "/opt/golang/go1.9"
551550
- id: osx
552551
display_name: "MacOS 10.12"
553552
run_on: macos-1012
553+
variables:
554+
GO_DIST: "/opt/golang/go1.9"
554555

555556

556557
buildvariants:
557558
- name: static-analysis
558559
display_name: "Static Analysis"
559560
run_on:
560561
- ubuntu1604-build
562+
expansions:
563+
GO_DIST: "/opt/golang/go1.9"
561564
tasks:
562565
- name: ".static-analysis"
563566

0 commit comments

Comments
 (0)