diff options
| -rw-r--r-- | etc/evergreen.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 1838ccc325d..ee78b0c7bda 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -8253,7 +8253,7 @@ buildvariants: exe: ".exe" content_type: application/zip num_jobs_available: $(grep -c ^processor /proc/cpuinfo) - compile_flags: --dbg=on --opt=on --win-version-min=ws08r2 -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) MONGO_DISTMOD=2012plus + compile_flags: --dbg=on --opt=on --win-version-min=ws08r2 -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) MONGO_DISTMOD=2008plus # We invoke SCons using --jobs = (# of CPUs / 4) to avoid causing out of memory errors due to # spawning a large number of linker processes. num_scons_link_jobs_available: $(( $(grep -c ^processor /proc/cpuinfo) / 4 )) @@ -8802,11 +8802,11 @@ buildvariants: push_path: win32 push_bucket: downloads.mongodb.org push_name: win32 - push_arch: x86_64-2012plus + push_arch: x86_64-2008plus-ssl multiversion_platform: windows_x86_64-2008plus-ssl msi_target: msi content_type: application/zip - compile_flags: --release --ssl MONGO_DISTMOD=2012plus CPPPATH="c:/openssl/include" LIBPATH="c:/openssl/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --dynamic-windows --win-version-min=ws08r2 + compile_flags: --release --ssl MONGO_DISTMOD=2008plus-ssl CPPPATH="c:/openssl/include" LIBPATH="c:/openssl/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --dynamic-windows --win-version-min=ws08r2 # We invoke SCons using --jobs = (# of CPUs / 4) to avoid causing out of memory errors due to # spawning a large number of linker processes. num_scons_link_jobs_available: $(( $(grep -c ^processor /proc/cpuinfo) / 4 )) @@ -8921,7 +8921,7 @@ buildvariants: platform_decompress: unzip exe: ".exe" content_type: application/zip - compile_flags: --dbg=on --opt=off --ssl MONGO_DISTMOD=2012plus CPPPATH="c:/openssl/include c:/sasl/include c:/snmp/include c:/curl/include" LIBPATH="c:/openssl/lib c:/sasl/lib c:/snmp/lib c:/curl/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --dynamic-windows --win-version-min=ws08r2 + compile_flags: --dbg=on --opt=off --ssl MONGO_DISTMOD=2008plus CPPPATH="c:/openssl/include c:/sasl/include c:/snmp/include c:/curl/include" LIBPATH="c:/openssl/lib c:/sasl/lib c:/snmp/lib c:/curl/lib" -j$(( $(grep -c ^processor /proc/cpuinfo) / 2 )) --dynamic-windows --win-version-min=ws08r2 # We invoke SCons using --jobs = (# of CPUs / 4) to avoid causing out of memory errors due to # spawning a large number of linker processes. num_scons_link_jobs_available: $(( $(grep -c ^processor /proc/cpuinfo) / 4 )) @@ -8955,11 +8955,11 @@ buildvariants: test_flags: --excludeWithAnyTags=requires_mmapv1,requires_ssl_mongo_tools push_path: osx push_bucket: downloads.mongodb.org - push_name: macos + push_name: osx-ssl push_arch: x86_64 compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" - multiversion_platform: macos + multiversion_platform: osx-ssl num_jobs_available: 1 gorootvars: 'PATH="/usr/local/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/usr/local/go1.8/go CGO_CPPFLAGS=-I/opt/mongodbtoolchain/v2/include CGO_CFLAGS=-mmacosx-version-min=10.10 CGO_LDFLAGS=-mmacosx-version-min=10.10' tooltags: "-tags 'ssl openssl_pre_1.0'" @@ -9099,7 +9099,7 @@ buildvariants: test_flags: --excludeWithAnyTags=requires_mmapv1,requires_ssl_mongo_tools push_path: osx push_bucket: downloads.10gen.com - push_name: macos + push_name: osx push_arch: x86_64-enterprise compile_env: DEVELOPER_DIR=/Applications/Xcode8.3.app compile_flags: --ssl -j$(sysctl -n hw.logicalcpu) --release --libc++ CCFLAGS="-mmacosx-version-min=10.10" LINKFLAGS="-mmacosx-version-min=10.10" |