Skip to content

Commit 6377276

Browse files
committed
CDRIVER-3480 migrate from macos-1012 to 1014
1 parent 99df1ba commit 6377276

File tree

4 files changed

+28
-13
lines changed

4 files changed

+28
-13
lines changed

.evergreen/compile-unix.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ echo "ZSTD: $ZSTD"
6161
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
6262
echo "OS: $OS"
6363

64+
# Since zstd inconsitently installed on macos-1014.
65+
# Remove this check in CDRIVER-3483.
66+
if [ "darwin" = "$OS" ]; then
67+
ZSTD="OFF"
68+
fi
69+
6470
# Automatically retrieve the machine architecture, lowercase, unless provided
6571
# as an environment variable (e.g. to force 32bit)
6672
[ -z "$MARCH" ] && MARCH=$(uname -m | tr '[:upper:]' '[:lower:]')

.evergreen/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12362,10 +12362,10 @@ buildvariants:
1236212362
- link-with-cmake-snappy-deprecated
1236312363
- name: link-with-cmake-mac
1236412364
distros:
12365-
- macos-1012
12365+
- macos-1014
1236612366
- name: link-with-cmake-mac-deprecated
1236712367
distros:
12368-
- macos-1012
12368+
- macos-1014
1236912369
- name: link-with-cmake-windows
1237012370
distros:
1237112371
- windows-64-vs2015-compile
@@ -12383,15 +12383,15 @@ buildvariants:
1238312383
- ubuntu1604-test
1238412384
- name: link-with-pkg-config-mac
1238512385
distros:
12386-
- macos-1012
12386+
- macos-1014
1238712387
- link-with-pkg-config-ssl
1238812388
- link-with-bson
1238912389
- name: link-with-bson-windows
1239012390
distros:
1239112391
- windows-64-vs2015-compile
1239212392
- name: link-with-bson-mac
1239312393
distros:
12394-
- macos-1012
12394+
- macos-1014
1239512395
- name: link-with-bson-mingw
1239612396
distros:
1239712397
- windows-64-vs2013-compile
@@ -12670,9 +12670,9 @@ buildvariants:
1267012670
display_name: '*Darwin, macOS (Apple LLVM)'
1267112671
expansions:
1267212672
CC: clang
12673-
run_on: macos-1012
12673+
run_on: macos-1014
1267412674
tasks:
12675-
- .compression !.snappy
12675+
- .compression !.snappy !.zstd
1267612676
- debug-compile-coverage
1267712677
- release-compile
1267812678
- debug-compile-nosasl-nossl

.evergreen/link-sample-program.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,16 @@ else
7373
STATIC_CMAKE_OPTION="-DENABLE_STATIC=OFF -DENABLE_TESTS=OFF"
7474
fi
7575

76+
# Since zstd inconsitently installed on macos-1014
77+
# Remove this check in CDRIVER-3483.
78+
if [ "darwin" = "$OS" ]; then
79+
ZSTD="OFF"
80+
else
81+
ZSTD="AUTO"
82+
fi
83+
7684

77-
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_BSON=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF .
85+
$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_BSON=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF -DENABLE_ZSTD=$ZSTD .
7886
make
7987
make install
8088

build/evergreen_config_lib/variants.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
'link-with-cmake-ssl-deprecated',
4848
'link-with-cmake-snappy',
4949
'link-with-cmake-snappy-deprecated',
50-
OD([('name', 'link-with-cmake-mac'), ('distros', ['macos-1012'])]),
51-
OD([('name', 'link-with-cmake-mac-deprecated'), ('distros', ['macos-1012'])]),
50+
OD([('name', 'link-with-cmake-mac'), ('distros', ['macos-1014'])]),
51+
OD([('name', 'link-with-cmake-mac-deprecated'), ('distros', ['macos-1014'])]),
5252
OD([('name', 'link-with-cmake-windows'),
5353
('distros', ['windows-64-vs2015-compile'])]),
5454
OD([('name', 'link-with-cmake-windows-ssl'),
@@ -60,12 +60,12 @@
6060
OD([('name', 'link-with-pkg-config'),
6161
('distros', ['ubuntu1604-test'])]),
6262
OD([('name', 'link-with-pkg-config-mac'),
63-
('distros', ['macos-1012'])]),
63+
('distros', ['macos-1014'])]),
6464
'link-with-pkg-config-ssl',
6565
'link-with-bson',
6666
OD([('name', 'link-with-bson-windows'),
6767
('distros', ['windows-64-vs2015-compile'])]),
68-
OD([('name', 'link-with-bson-mac'), ('distros', ['macos-1012'])]),
68+
OD([('name', 'link-with-bson-mac'), ('distros', ['macos-1014'])]),
6969
OD([('name', 'link-with-bson-mingw'),
7070
('distros', ['windows-64-vs2013-compile'])]),
7171
'check-headers',
@@ -306,8 +306,9 @@
306306
{'CC': 'gcc'}),
307307
Variant('darwin',
308308
'*Darwin, macOS (Apple LLVM)',
309-
'macos-1012',
310-
['.compression !.snappy',
309+
'macos-1014',
310+
['.compression !.snappy !.zstd',
311+
# Remove !.zstd in CDRIVER-3483.
311312
'debug-compile-coverage',
312313
'release-compile',
313314
'debug-compile-nosasl-nossl',

0 commit comments

Comments
 (0)