diff options
| -rwxr-xr-x | buildscripts/generate_compile_expansions.py | 2 | ||||
| -rwxr-xr-x | buildscripts/generate_compile_expansions_shared_cache.py | 2 | ||||
| -rw-r--r-- | etc/evergreen.yml | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/buildscripts/generate_compile_expansions.py b/buildscripts/generate_compile_expansions.py index 12276b4a1b0..ff830aab057 100755 --- a/buildscripts/generate_compile_expansions.py +++ b/buildscripts/generate_compile_expansions.py @@ -64,9 +64,11 @@ def generate_version_expansions(): if version_parts[0]: expansions["suffix"] = "v4.0-latest" expansions["src_suffix"] = "v4.0-latest" + expansions["is_release"] = "false" else: expansions["suffix"] = version_line expansions["src_suffix"] = "r{0}".format(version_line) + expansions["is_release"] = "true" expansions["version"] = version_line return expansions diff --git a/buildscripts/generate_compile_expansions_shared_cache.py b/buildscripts/generate_compile_expansions_shared_cache.py index 969b84c7790..f150764899f 100755 --- a/buildscripts/generate_compile_expansions_shared_cache.py +++ b/buildscripts/generate_compile_expansions_shared_cache.py @@ -64,9 +64,11 @@ def generate_version_expansions(): if version_parts[0]: expansions["suffix"] = "v4.0-latest" expansions["src_suffix"] = "v4.0-latest" + expansions["is_release"] = "false" else: expansions["suffix"] = version_line expansions["src_suffix"] = "r{0}".format(version_line) + expansions["is_release"] = "true" expansions["version"] = version_line return expansions diff --git a/etc/evergreen.yml b/etc/evergreen.yml index f6084335725..7ad3fc8be8a 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1120,13 +1120,11 @@ functions: ./gradlew clean :embedded-jar:build :embedded-jar:publishMavenPublicationToLocalRepository # Is this a release? - echo "${version|-g}" | grep -q -- "-g" - if [ $? -eq 1 ]; then + if [ "${is_release|false}" = "true" ]; then source ./artifactory_mobile_creds.sh ./gradlew --info :embedded-jar:artifactoryPublish fi - mkdir -p ../../../../../build/mongo-embedded-sdk-${version}/java cp -r embedded-jar/build/repo/* ../../../../../build/mongo-embedded-sdk-${version}/java else @@ -1139,8 +1137,7 @@ functions: ./gradlew clean :embedded-android:build # Is this a release? - echo "${version|-g}" | grep -q -- "-g" - if [ $? -eq 1 ]; then + if [ "${is_release|false}" = "true" ]; then ./gradlew :embedded-android:uploadArchives closeAndReleaseRepository fi |