diff options
| author | Ryan Egesdahl <ryan.egesdahl@mongodb.com> | 2022-06-09 15:02:53 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-09 16:02:08 +0000 |
| commit | 131ea34b9d629fc0f74dad8d664d724b569363e1 (patch) | |
| tree | a26a31f9c3f93ab55c775eb083d541d4da6b953c /evergreen/functions | |
| parent | 2f6c45ee3af6d2e53c53ebb9ec266b59a27a3112 (diff) | |
| download | mongo-131ea34b9d629fc0f74dad8d664d724b569363e1.tar.gz | |
SERVER-63191 Fix Windows builds with generated version expansions
Diffstat (limited to 'evergreen/functions')
| -rw-r--r-- | evergreen/functions/compile_expansions_generate.sh | 4 | ||||
| -rwxr-xr-x | evergreen/functions/version_expansions_generate.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/evergreen/functions/compile_expansions_generate.sh b/evergreen/functions/compile_expansions_generate.sh index b7d108b1b49..fe06d0fdf7d 100644 --- a/evergreen/functions/compile_expansions_generate.sh +++ b/evergreen/functions/compile_expansions_generate.sh @@ -35,12 +35,12 @@ if [ ! -z ${scons_cache_scope} ]; then set -o errexit fi echo "Shared Cache with setting: ${scons_cache_scope}" - SCONS_CACHE_MODE=${scons_cache_mode} SCONS_CACHE_SCOPE=$scons_cache_scope IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue} buildscripts/generate_compile_expansions_shared_cache.py --out compile_expansions.yml + SCONS_CACHE_MODE=${scons_cache_mode} SCONS_CACHE_SCOPE=$scons_cache_scope IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue} $python buildscripts/generate_compile_expansions_shared_cache.py --out compile_expansions.yml # Legacy Expansion generation else echo "Using legacy expansion generation" # Proceed with regular expansions generated # 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. - SCONS_CACHE_MODE=${scons_cache_mode} USE_SCONS_CACHE=${use_scons_cache} IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue} buildscripts/generate_compile_expansions.py --out compile_expansions.yml + SCONS_CACHE_MODE=${scons_cache_mode} USE_SCONS_CACHE=${use_scons_cache} IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue} $python buildscripts/generate_compile_expansions.py --out compile_expansions.yml fi diff --git a/evergreen/functions/version_expansions_generate.sh b/evergreen/functions/version_expansions_generate.sh index 6dae45134d9..c0e577a59e6 100755 --- a/evergreen/functions/version_expansions_generate.sh +++ b/evergreen/functions/version_expansions_generate.sh @@ -14,4 +14,5 @@ if [ "${is_patch}" = "true" ]; then fi echo "MONGO_VERSION = ${MONGO_VERSION}" -MONGO_VERSION=${MONGO_VERSION} IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue} buildscripts/generate_version_expansions.py --out version_expansions.yml +activate_venv +MONGO_VERSION=${MONGO_VERSION} IS_PATCH=${is_patch} IS_COMMIT_QUEUE=${is_commit_queue} $python buildscripts/generate_version_expansions.py --out version_expansions.yml |