mirror of
https://github.com/mongodb/mongo.git
synced 2024-11-24 08:30:56 +01:00
SERVER-25706: only exclude linked artifacts from scons cache on static builds
This commit is contained in:
parent
af166b15f2
commit
9a56947f7e
@ -75,5 +75,11 @@ if os.path.isfile(system_id_path):
|
||||
|
||||
print "scons_cache_path: {0}".format(default_cache_path)
|
||||
|
||||
scons_cache_mode = os.getenv("SCONS_CACHE_MODE")
|
||||
|
||||
if scons_cache_mode in (None, ""):
|
||||
scons_cache_mode = "nolinked"
|
||||
|
||||
if os.getenv("USE_SCONS_CACHE") not in (None, False, "false", ""):
|
||||
print "scons_cache_args: --cache=nolinked --cache-dir='{0}'".format(default_cache_path)
|
||||
print "scons_cache_args: --cache={0} --cache-dir='{1}'".format(scons_cache_mode,
|
||||
default_cache_path)
|
||||
|
@ -915,7 +915,7 @@ tasks:
|
||||
|
||||
# This script converts the generated version string into a sanitized version string for
|
||||
# use by scons and uploading artifacts as well as information about for the scons cache.
|
||||
echo $MONGO_VERSION | USE_SCONS_CACHE=${use_scons_cache|false} ${python|python} buildscripts/generate_compile_expansions.py | tee compile_expansions.yml
|
||||
echo $MONGO_VERSION | SCONS_CACHE_MODE=${scons_cache_mode|nolinked} USE_SCONS_CACHE=${use_scons_cache|false} ${python|python} buildscripts/generate_compile_expansions.py | tee compile_expansions.yml
|
||||
# Then we load the generated version data into the agent so we can use it in task definitions
|
||||
- command: expansions.update
|
||||
params:
|
||||
@ -7834,6 +7834,7 @@ buildvariants:
|
||||
compile_flags: --ssl MONGO_DISTMOD=ubuntu1604 -j$(grep -c ^processor /proc/cpuinfo) CC=/opt/mongodbtoolchain/v2/bin/gcc CXX=/opt/mongodbtoolchain/v2/bin/g++ OBJCOPY=/opt/mongodbtoolchain/v2/bin/objcopy --link-model=dynamic
|
||||
num_jobs_available: $(grep -c ^processor /proc/cpuinfo)
|
||||
use_scons_cache: true
|
||||
scons_cache_mode: all
|
||||
tasks:
|
||||
- name: compile
|
||||
distros:
|
||||
|
Loading…
Reference in New Issue
Block a user