Skip to content

Commit c9426ef

Browse files
authored
GODRIVER-2442 replace macos-1014 with macos-1015 in Evergreen (#968)
1 parent eb5e832 commit c9426ef

File tree

2 files changed

+25
-21
lines changed

2 files changed

+25
-21
lines changed

.evergreen/config.yml

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,25 @@ functions:
104104
cp ./bin/mongocrypt.dll c:/libmongocrypt/bin
105105
cp ./include/mongocrypt/*.h c:/libmongocrypt/include
106106
export PATH=$PATH:/cygdrive/c/libmongocrypt/bin
107+
elif [ "Darwin" = "$(uname -s)" ]; then
108+
# TODO (GODRIVER-2442): Once libmongocrypt compiles on macOS 10.15, remove this elif block.
109+
echo "fetching build for Darwin ... begin"
110+
mkdir -p install/libmongocrypt
111+
mkdir libmongocrypt-all
112+
cd libmongocrypt-all
113+
# LIBMONGOCRYPT_COMMIT is for 1.5.0-rc1.
114+
LIBMONGOCRYPT_COMMIT="6e100b087376d448534cb2ad1b4dc50cb7cbc1f6"
115+
# The following URL is published from the upload-all task in the libmongocrypt Evergreen project.
116+
curl https://mciuploads.s3.amazonaws.com/libmongocrypt/all/master/$LIBMONGOCRYPT_COMMIT/libmongocrypt-all.tar.gz -o libmongocrypt-all.tar.gz
117+
tar -xf libmongocrypt-all.tar.gz
118+
cd ..
119+
mv libmongocrypt-all/macos/include ./install/libmongocrypt
120+
mv libmongocrypt-all/macos/lib ./install/libmongocrypt
121+
rm -rf libmongocrypt-all
122+
rm libmongocrypt-all.tar.gz
123+
# Fix prefix in pkg-config prefix path.
124+
sed -i "" -E "s+prefix=.*+prefix=$(pwd)/install/libmongocrypt+" ./install/libmongocrypt/lib/pkgconfig/libmongocrypt.pc
125+
echo "fetching build for Darwin ... end"
107126
else
108127
# TODO (GODRIVER-2436): do not use pre-release of libmongocrypt.
109128
git clone https://github.com/mongodb/libmongocrypt --branch 1.5.0-rc1
@@ -2001,8 +2020,8 @@ axes:
20012020
# tests use mongocryptd instead.
20022021
SKIP_CRYPT_SHARED_LIB_DOWNLOAD: "true"
20032022
- id: "osx-go-1-17"
2004-
display_name: "MacOS 10.14"
2005-
run_on: macos-1014
2023+
display_name: "MacOS 10.15"
2024+
run_on: macos-1015
20062025
variables:
20072026
GO_DIST: "/opt/golang/go1.17"
20082027
PYTHON3_BINARY: python3
@@ -2027,8 +2046,8 @@ axes:
20272046
GO_DIST: "/opt/golang/go1.17"
20282047
PYTHON3_BINARY: "/opt/python/3.8/bin/python3"
20292048
- id: "osx-go-1-17"
2030-
display_name: "MacOS 10.14"
2031-
run_on: macos-1014
2049+
display_name: "MacOS 10.15"
2050+
run_on: macos-1015
20322051
variables:
20332052
GO_DIST: "/opt/golang/go1.17"
20342053
PYTHON3_BINARY: python3
@@ -2063,8 +2082,8 @@ axes:
20632082
GO_DIST: "/opt/golang/go1.17"
20642083
PYTHON3: python3
20652084
- id: "osx-go-1-17"
2066-
display_name: "MacOS 10.14"
2067-
run_on: macos-1014
2085+
display_name: "MacOS 10.15"
2086+
run_on: macos-1015
20682087
variables:
20692088
GO_DIST: "/opt/golang/go1.17"
20702089
SKIP_ECS_AUTH_TEST: true

.evergreen/run-tests.sh

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,6 @@ if [ "Windows_NT" = "$OS" ]; then
1010
export GOPATH=$(cygpath -m $GOPATH)
1111
export GOCACHE=$(cygpath -m $GOCACHE)
1212
export DRIVERS_TOOLS=$(cygpath -m $DRIVERS_TOOLS)
13-
14-
if [ ! -d "c:/libmongocrypt/include" ]; then
15-
mkdir -p c:/libmongocrypt/include
16-
mkdir -p c:/libmongocrypt/bin
17-
curl https://s3.amazonaws.com/mciuploads/libmongocrypt/windows/latest_release/libmongocrypt.tar.gz --output libmongocrypt.tar.gz
18-
tar -xvzf libmongocrypt.tar.gz
19-
cp ./bin/mongocrypt.dll c:/libmongocrypt/bin
20-
cp ./include/mongocrypt/*.h c:/libmongocrypt/include
21-
export PATH=$PATH:/cygdrive/c/libmongocrypt/bin
22-
fi
23-
else
24-
if [ ! -d "libmongocrypt" ]; then
25-
git clone https://github.com/mongodb/libmongocrypt
26-
./libmongocrypt/.evergreen/compile.sh
27-
fi
2813
fi
2914

3015
export GOROOT="${GOROOT}"

0 commit comments

Comments
 (0)