diff options
| -rwxr-xr-x | buildscripts/generate_compile_expansions_shared_cache.py | 4 | ||||
| -rw-r--r-- | etc/evergreen.yml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/buildscripts/generate_compile_expansions_shared_cache.py b/buildscripts/generate_compile_expansions_shared_cache.py index 1fbfdfb6aec..2c6436d1bec 100755 --- a/buildscripts/generate_compile_expansions_shared_cache.py +++ b/buildscripts/generate_compile_expansions_shared_cache.py @@ -99,8 +99,8 @@ def generate_scons_cache_expansions(): shared_mount_root = '/efs' default_cache_path = os.path.join(shared_mount_root, system_uuid, "scons-cache") expansions["scons_cache_path"] = default_cache_path - # Patches are read only - if os.getenv("IS_PATCH"): + # Patches are read only, unless they are for a commit queue merge. + if os.getenv("IS_PATCH") and os.getenv("IS_COMMIT_QUEUE") != "true": expansions[ "scons_cache_args"] = "--cache={0} --cache-dir='{1}' --cache-readonly".format( scons_cache_mode, default_cache_path) diff --git a/etc/evergreen.yml b/etc/evergreen.yml index e9d635113d3..5fbbd9aff13 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1980,7 +1980,7 @@ functions: fi echo "Shared Cache with setting: ${scons_cache_scope}" - MONGO_VERSION=$MONGO_VERSION SCONS_CACHE_MODE=${scons_cache_mode|nolinked} SCONS_CACHE_SCOPE=$scons_cache_scope IS_PATCH=${is_patch} $python buildscripts/generate_compile_expansions_shared_cache.py --out compile_expansions.yml + MONGO_VERSION=$MONGO_VERSION SCONS_CACHE_MODE=${scons_cache_mode|nolinked} SCONS_CACHE_SCOPE=$scons_cache_scope IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue|false} $python buildscripts/generate_compile_expansions_shared_cache.py --out compile_expansions.yml # Legacy Expansion generation else |