diff options
author | David Hows <howsdav@gmail.com> | 2016-06-24 11:49:34 +1000 |
---|---|---|
committer | David Hows <howsdav@gmail.com> | 2016-06-24 11:49:34 +1000 |
commit | 26f52430045628626deef0bfc0444dd3f2c45c3a (patch) | |
tree | 30dd7f2131780dfe590ed654d47718cda3bcd1dc | |
parent | 2f79ca95fabe7d4eb0bd7c05be1b5d53ed26273c (diff) | |
download | mongo-26f52430045628626deef0bfc0444dd3f2c45c3a.tar.gz |
Revert "SERVER-21977 Add patch id to version string in patch builds"
This reverts commit d3c81ef49f77a0bae5e0ebe9dd002df98348c8f2.
-rw-r--r-- | etc/evergreen.yml | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 5f689d0a46e..e0836076d98 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -523,30 +523,6 @@ tasks: - func: "build new tools" # noop if ${newtools} is not "true" - func: "build rocksdb" # noop if ${build_rocksdb} is not "true" - command: shell.exec - params: - working_dir: src - script: | - set -o errexit - set -o verbose - - # We get the raw version string (r1.2.3-45-gabcdef) from git - MONGO_VERSION=$(git describe) - # If this is a patch build, we add the patch version id to the version string so we know - # this build was a patch, and which evergreen task it came from - if [ "${is_patch|}" = "true" ]; then - MONGO_VERSION="$MONGO_VERSION-patch-${version_id}" - fi - - # This script converts the generated version string into a sanitized version string for - # use by scons and uploading artifacts. - echo $MONGO_VERSION | ${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: - file: src/compile_expansions.yml - - - command: shell.exec type: test params: working_dir: src @@ -555,9 +531,9 @@ tasks: set -o verbose rm -rf ${install_directory|/data/mongo-install-directory} + ${scons|scons} ${compile_flags|} --use-new-tools all dist dist-debugsymbols distsrc-${ext|tgz} ${msi_target|} git describe | ${python|python} buildscripts/generate_compile_expansions.py | tee compile_expansions.yml - ${scons|scons} ${compile_flags|} --use-new-tools all dist dist-debugsymbols distsrc-${ext|tgz} ${msi_target|} MONGO_VERSION=${version} mv mongodb-src-*.${ext|tgz} distsrc.${ext|tgz} mv mongodb-*-debugsymbols.${ext|tgz} mongo-debugsymbols.tgz || true @@ -575,6 +551,9 @@ tasks: # On windows we need to make sure the paths in unittests.txt are compatible with cygwin tar sed 's|\\|/|g' build/unittests.txt > build/unittests-tarlist.txt ${tar|tar} -czvf mongodb-unittests.tgz -T build/unittests-tarlist.txt build/unittests.txt + - command: expansions.update + params: + file: src/compile_expansions.yml - command: shell.exec params: working_dir: src |