Skip to content

Commit baa40c7

Browse files
matthewdalematthewdale
authored
GODRIVER-1951 Update the Go version for Evergreen builds to 1.16 (#663)
1 parent dabf9b6 commit baa40c7

File tree

2 files changed

+45
-32
lines changed

2 files changed

+45
-32
lines changed

‎.evergreen/config.yml

Lines changed: 44 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -315,13 +315,19 @@ functions:
315315
. ${DRIVERS_TOOLS}/.evergreen/csfle/set-temp-creds.sh
316316
fi
317317
318+
# If GO_BUILD_TAGS is not set, set the default Go build tags to "cse" to enable
319+
# client-side encryption, which requires linking the libmongocrypt C library.
320+
if [ -z ${GO_BUILD_TAGS+x} ]; then
321+
GO_BUILD_TAGS="cse"
322+
fi
323+
318324
export GOFLAGS=-mod=vendor
319325
AUTH=${AUTH} \
320326
SSL=${SSL} \
321327
MONGODB_URI="${MONGODB_URI}" \
322328
TOPOLOGY=${TOPOLOGY} \
323329
MONGO_GO_DRIVER_COMPRESSOR=${MONGO_GO_DRIVER_COMPRESSOR} \
324-
BUILD_TAGS="-tags cse" \
330+
BUILD_TAGS="-tags ${GO_BUILD_TAGS}" \
325331
AWS_ACCESS_KEY_ID="${cse_aws_access_key_id}" \
326332
AWS_SECRET_ACCESS_KEY="${cse_aws_secret_access_key}" \
327333
AWS_DEFAULT_REGION="us-east-1" \
@@ -1824,87 +1830,94 @@ axes:
18241830
- id: os-ssl-legacy
18251831
display_name: OS
18261832
values:
1827-
- id: "ubuntu1404-go-1-15"
1833+
- id: "ubuntu1404-go-1-16"
18281834
display_name: "Ubuntu 14.04"
18291835
run_on: ubuntu1404-test
18301836
variables:
1831-
GO_DIST: "/opt/golang/go1.15"
1837+
GO_DIST: "/opt/golang/go1.16"
1838+
# The GCC toolchain that comes with Ubuntu 14.04 is incompatible with the standard binary
1839+
# release of Go 1.16. As a result, Cgo builds on Ubuntu 14.04 fail with a linking error
1840+
# (see https://github.com/golang/go/issues/43996). On Ubuntu 14.04, we only run tests for
1841+
# server v2.6 and 3.X, which don't support client-side encryption. Exclude all build tags
1842+
# to prevent attempting to link the client-side encryption (libmongocrypt) binaries when
1843+
# running Go tests.
1844+
GO_BUILD_TAGS: ""
18321845

18331846
# OSes that require >= 3.2 for SSL
18341847
- id: os-ssl-32
18351848
display_name: OS
18361849
values:
1837-
- id: "windows-64-go-1-15"
1850+
- id: "windows-64-go-1-16"
18381851
display_name: "Windows 64-bit"
18391852
run_on:
18401853
- windows-64-vs2017-test
18411854
variables:
18421855
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1843-
GO_DIST: "C:\\golang\\go1.15"
1856+
GO_DIST: "C:\\golang\\go1.16"
18441857
PYTHON3_BINARY: "C:/python/Python38/python.exe"
18451858
VENV_BIN_DIR: "Scripts"
1846-
- id: "ubuntu1604-64-go-1-15"
1859+
- id: "ubuntu1604-64-go-1-16"
18471860
display_name: "Ubuntu 16.04"
18481861
run_on: ubuntu1604-build
18491862
variables:
1850-
GO_DIST: "/opt/golang/go1.15"
1863+
GO_DIST: "/opt/golang/go1.16"
18511864
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
1852-
- id: "osx-go-1-15"
1865+
- id: "osx-go-1-16"
18531866
display_name: "MacOS 10.14"
18541867
run_on: macos-1014
18551868
variables:
1856-
GO_DIST: "/opt/golang/go1.15"
1869+
GO_DIST: "/opt/golang/go1.16"
18571870
PYTHON3_BINARY: python3
18581871

18591872
# OSes that require >= 4.0 for SSL
18601873
- id: os-ssl-40
18611874
display_name: OS
18621875
values:
1863-
- id: "windows-64-go-1-15"
1876+
- id: "windows-64-go-1-16"
18641877
display_name: "Windows 64-bit"
18651878
run_on:
18661879
- windows-64-vs2017-test
18671880
variables:
18681881
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1869-
GO_DIST: "C:\\golang\\go1.15"
1882+
GO_DIST: "C:\\golang\\go1.16"
18701883
PYTHON3_BINARY: "C:/python/Python38/python.exe"
18711884
VENV_BIN_DIR: "Scripts"
1872-
- id: "ubuntu1804-64-go-1-15"
1885+
- id: "ubuntu1804-64-go-1-16"
18731886
display_name: "Ubuntu 18.04"
18741887
run_on: ubuntu1804-build
18751888
variables:
1876-
GO_DIST: "/opt/golang/go1.15"
1889+
GO_DIST: "/opt/golang/go1.16"
18771890
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
1878-
- id: "osx-go-1-15"
1891+
- id: "osx-go-1-16"
18791892
display_name: "MacOS 10.14"
18801893
run_on: macos-1014
18811894
variables:
1882-
GO_DIST: "/opt/golang/go1.15"
1895+
GO_DIST: "/opt/golang/go1.16"
18831896
PYTHON3_BINARY: python3
18841897

18851898
- id: os-aws-auth
18861899
display_name: OS
18871900
values:
1888-
- id: "windows-64-vsMulti-small-go-1-15"
1901+
- id: "windows-64-vsMulti-small-go-1-16"
18891902
display_name: "Windows 64-bit"
18901903
run_on:
18911904
- windows-64-vsMulti-small
18921905
variables:
18931906
GCC_PATH: "/cygdrive/c/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin"
1894-
GO_DIST: "C:\\golang\\go1.15"
1907+
GO_DIST: "C:\\golang\\go1.16"
18951908
SKIP_ECS_AUTH_TEST: true
18961909
PYTHON3: "C:/python/Python38/python.exe"
1897-
- id: "ubuntu1804-64-go-1-15"
1910+
- id: "ubuntu1804-64-go-1-16"
18981911
display_name: "Ubuntu 18.04"
18991912
run_on: ubuntu1804-test
19001913
variables:
1901-
GO_DIST: "/opt/golang/go1.15"
1914+
GO_DIST: "/opt/golang/go1.16"
19021915
PYTHON3: python3
1903-
- id: "osx-go-1-15"
1916+
- id: "osx-go-1-16"
19041917
display_name: "MacOS 10.14"
19051918
run_on: macos-1014
19061919
variables:
1907-
GO_DIST: "/opt/golang/go1.15"
1920+
GO_DIST: "/opt/golang/go1.16"
19081921
SKIP_ECS_AUTH_TEST: true
19091922
SKIP_EC2_AUTH_TEST: true
19101923
PYTHON3: python3
@@ -1915,7 +1928,7 @@ buildvariants:
19151928
run_on:
19161929
- ubuntu1804-build
19171930
expansions:
1918-
GO_DIST: "/opt/golang/go1.15"
1931+
GO_DIST: "/opt/golang/go1.16"
19191932
tasks:
19201933
- name: ".static-analysis"
19211934

@@ -1924,7 +1937,7 @@ buildvariants:
19241937
run_on:
19251938
- ubuntu1804-build
19261939
expansions:
1927-
GO_DIST: "/opt/golang/go1.15"
1940+
GO_DIST: "/opt/golang/go1.16"
19281941
tasks:
19291942
- name: ".performance"
19301943

@@ -1933,7 +1946,7 @@ buildvariants:
19331946
run_on:
19341947
- ubuntu1804-test
19351948
expansions:
1936-
GO_DIST: "/opt/golang/go1.15"
1949+
GO_DIST: "/opt/golang/go1.16"
19371950
tasks:
19381951
- name: ".compile-check"
19391952

@@ -1942,7 +1955,7 @@ buildvariants:
19421955
run_on:
19431956
- ubuntu1804-build
19441957
expansions:
1945-
GO_DIST: "/opt/golang/go1.15"
1958+
GO_DIST: "/opt/golang/go1.16"
19461959
tasks:
19471960
- name: "atlas-test"
19481961

@@ -1951,7 +1964,7 @@ buildvariants:
19511964
run_on:
19521965
- ubuntu1804-build
19531966
expansions:
1954-
GO_DIST: "/opt/golang/go1.15"
1967+
GO_DIST: "/opt/golang/go1.16"
19551968
tasks:
19561969
- name: "test-atlas-data-lake"
19571970

@@ -2012,22 +2025,22 @@ buildvariants:
20122025

20132026
# GODRIVER-1961 Upgrade OCSP tests to use os-ssl-40 and Ubuntu 18.04.
20142027
- matrix_name: "ocsp-test"
2015-
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["ubuntu1604-64-go-1-15"] }
2028+
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["ubuntu1604-64-go-1-16"] }
20162029
display_name: "OCSP ${version} ${os-ssl-32}"
20172030
batchtime: 20160 # 14 days
20182031
tasks:
20192032
- name: ".ocsp"
20202033

20212034
- matrix_name: "ocsp-test-windows"
2022-
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["windows-64-go-1-15"] }
2035+
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["windows-64-go-1-16"] }
20232036
display_name: "OCSP ${version} ${os-ssl-32}"
20242037
batchtime: 20160 # 14 days
20252038
tasks:
20262039
# Windows MongoDB servers do not staple OCSP responses and only support RSA.
20272040
- name: ".ocsp-rsa !.ocsp-staple"
20282041

20292042
- matrix_name: "ocsp-test-macos"
2030-
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["osx-go-1-15"] }
2043+
matrix_spec: { version: ["4.4", "latest"], os-ssl-32: ["osx-go-1-16"] }
20312044
display_name: "OCSP ${version} ${os-ssl-32}"
20322045
batchtime: 20160 # 14 days
20332046
tasks:
@@ -2041,14 +2054,14 @@ buildvariants:
20412054
- name: ".versioned-api"
20422055

20432056
- matrix_name: "kms-tls-test"
2044-
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-15"] }
2057+
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-16"] }
20452058
display_name: "KMS TLS ${version} ${os-ssl-40}"
20462059
tasks:
20472060
- name: ".kms-tls"
20482061

20492062
- matrix_name: "load-balancer-test"
20502063
# The LB software is only available on Ubuntu 18.04, so we don't test on all OSes.
2051-
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-15"] }
2064+
matrix_spec: { version: ["latest"], os-ssl-40: ["ubuntu1804-64-go-1-16"] }
20522065
display_name: "Load Balancer Support ${version} ${os-ssl-40}"
20532066
tasks:
20542067
- name: ".load-balancer"

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ evg-test-load-balancers:
170170
go test $(BUILD_TAGS) ./mongo/integration -run TestUnifiedSpecs/retryable-reads -v -timeout $(TEST_TIMEOUT)s >> test.suite
171171
go test $(BUILD_TAGS) ./mongo/integration -run TestRetryableWritesSpec -v -timeout $(TEST_TIMEOUT)s >> test.suite
172172
go test $(BUILD_TAGS) ./mongo/integration -run TestChangeStreamSpec -v -timeout $(TEST_TIMEOUT)s >> test.suite
173-
go test $(BULID_TAGS) ./mongo/integration -run TestInitialDNSSeedlistDiscoverySpec/load_balanced -v -timeout $(TEST_TIMEOUT)s >> test.suite
173+
go test $(BUILD_TAGS) ./mongo/integration -run TestInitialDNSSeedlistDiscoverySpec/load_balanced -v -timeout $(TEST_TIMEOUT)s >> test.suite
174174
go test $(BUILD_TAGS) ./mongo/integration -run TestLoadBalancerSupport -v -timeout $(TEST_TIMEOUT)s >> test.suite
175175
go test $(BUILD_TAGS) ./mongo/integration/unified -run TestUnifiedSpec -v -timeout $(TEST_TIMEOUT)s >> test.suite
176176

0 commit comments

Comments
 (0)