Skip to content

Commit 92f12ba

Browse files
authored
Bump MacOS distro version to 11.0. (#1067)
GODRIVER-2544 GODRIVER-2442
1 parent 1e144a8 commit 92f12ba

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

.evergreen/config.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,6 @@ functions:
114114
export PATH=$PATH:/cygdrive/c/libmongocrypt/bin
115115
rm -rf libmongocrypt-all
116116
echo "fetching build for Windows ... end"
117-
elif [ "Darwin" = "$(uname -s)" ]; then
118-
# TODO (GODRIVER-2442): Once libmongocrypt compiles on macOS 10.15, remove this elif block.
119-
echo "fetching build for Darwin ... begin"
120-
mkdir -p install/libmongocrypt
121-
mkdir libmongocrypt-all
122-
cd libmongocrypt-all
123-
# The following URL is published from the upload-all task in the libmongocrypt Evergreen project.
124-
curl https://mciuploads.s3.amazonaws.com/libmongocrypt/all/$LIBMONGOCRYPT_BRANCH/$LIBMONGOCRYPT_COMMIT/libmongocrypt-all.tar.gz -o libmongocrypt-all.tar.gz
125-
tar -xf libmongocrypt-all.tar.gz
126-
cd ..
127-
mv libmongocrypt-all/macos/include ./install/libmongocrypt
128-
mv libmongocrypt-all/macos/lib ./install/libmongocrypt
129-
rm -rf libmongocrypt-all
130-
# Fix prefix in pkg-config prefix path.
131-
sed -i "" -E "s+prefix=.*+prefix=$(pwd)/install/libmongocrypt+" ./install/libmongocrypt/lib/pkgconfig/libmongocrypt.pc
132-
echo "fetching build for Darwin ... end"
133117
else
134118
git clone https://github.com/mongodb/libmongocrypt
135119
cd libmongocrypt
@@ -2086,8 +2070,8 @@ axes:
20862070
GO_DIST: "/opt/golang/go1.18"
20872071
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
20882072
- id: "osx-go-1-18"
2089-
display_name: "MacOS 10.15"
2090-
run_on: macos-1015
2073+
display_name: "MacOS 11.0"
2074+
run_on: macos-1100
20912075
variables:
20922076
GO_DIST: "/opt/golang/go1.18"
20932077
PYTHON3_BINARY: python3
@@ -2112,8 +2096,8 @@ axes:
21122096
GO_DIST: "/opt/golang/go1.18"
21132097
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
21142098
- id: "osx-go-1-18"
2115-
display_name: "MacOS 10.15"
2116-
run_on: macos-1015
2099+
display_name: "MacOS 11.0"
2100+
run_on: macos-1100
21172101
variables:
21182102
GO_DIST: "/opt/golang/go1.18"
21192103
PYTHON3_BINARY: python3
@@ -2148,8 +2132,8 @@ axes:
21482132
GO_DIST: "/opt/golang/go1.18"
21492133
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
21502134
- id: "osx-go-1-18"
2151-
display_name: "MacOS 10.15"
2152-
run_on: macos-1015
2135+
display_name: "MacOS 11.0"
2136+
run_on: macos-1100
21532137
variables:
21542138
GO_DIST: "/opt/golang/go1.18"
21552139
SKIP_ECS_AUTH_TEST: true

0 commit comments

Comments
 (0)