Skip to content

Commit

Permalink
Bump MacOS distro version to 11.0. (#1067)
Browse files Browse the repository at this point in the history
  • Loading branch information
benjirewis authored Sep 14, 2022
1 parent 1e144a8 commit 92f12ba
Showing 1 changed file with 6 additions and 22 deletions.
28 changes: 6 additions & 22 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,22 +114,6 @@ functions:
export PATH=$PATH:/cygdrive/c/libmongocrypt/bin
rm -rf libmongocrypt-all
echo "fetching build for Windows ... end"
elif [ "Darwin" = "$(uname -s)" ]; then
# TODO (GODRIVER-2442): Once libmongocrypt compiles on macOS 10.15, remove this elif block.
echo "fetching build for Darwin ... begin"
mkdir -p install/libmongocrypt
mkdir libmongocrypt-all
cd libmongocrypt-all
# The following URL is published from the upload-all task in the libmongocrypt Evergreen project.
curl https://mciuploads.s3.amazonaws.com/libmongocrypt/all/$LIBMONGOCRYPT_BRANCH/$LIBMONGOCRYPT_COMMIT/libmongocrypt-all.tar.gz -o libmongocrypt-all.tar.gz
tar -xf libmongocrypt-all.tar.gz
cd ..
mv libmongocrypt-all/macos/include ./install/libmongocrypt
mv libmongocrypt-all/macos/lib ./install/libmongocrypt
rm -rf libmongocrypt-all
# Fix prefix in pkg-config prefix path.
sed -i "" -E "s+prefix=.*+prefix=$(pwd)/install/libmongocrypt+" ./install/libmongocrypt/lib/pkgconfig/libmongocrypt.pc
echo "fetching build for Darwin ... end"
else
git clone https://github.com/mongodb/libmongocrypt
cd libmongocrypt
Expand Down Expand Up @@ -2086,8 +2070,8 @@ axes:
GO_DIST: "/opt/golang/go1.18"
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
- id: "osx-go-1-18"
display_name: "MacOS 10.15"
run_on: macos-1015
display_name: "MacOS 11.0"
run_on: macos-1100
variables:
GO_DIST: "/opt/golang/go1.18"
PYTHON3_BINARY: python3
Expand All @@ -2112,8 +2096,8 @@ axes:
GO_DIST: "/opt/golang/go1.18"
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
- id: "osx-go-1-18"
display_name: "MacOS 10.15"
run_on: macos-1015
display_name: "MacOS 11.0"
run_on: macos-1100
variables:
GO_DIST: "/opt/golang/go1.18"
PYTHON3_BINARY: python3
Expand Down Expand Up @@ -2148,8 +2132,8 @@ axes:
GO_DIST: "/opt/golang/go1.18"
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
- id: "osx-go-1-18"
display_name: "MacOS 10.15"
run_on: macos-1015
display_name: "MacOS 11.0"
run_on: macos-1100
variables:
GO_DIST: "/opt/golang/go1.18"
SKIP_ECS_AUTH_TEST: true
Expand Down

0 comments on commit 92f12ba

Please sign in to comment.