diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2015-10-30 14:14:57 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon@mongodb.com> | 2015-12-04 18:06:38 -0500 |
| commit | 7e0b13ecedd37ff63a62369f660f3584612c9f78 (patch) | |
| tree | 1dca75e4e3cffd1e07785c381adcd119b98b2ff9 | |
| parent | 405a5c8d09ccd32294e70d525c4168780356ff16 (diff) | |
| download | mongo-7e0b13ecedd37ff63a62369f660f3584612c9f78.tar.gz | |
SERVER-21224 Use "git describe" instead of version.json
(cherry picked from commit 0c48b420af604e19deb1ad31d014aae0477b7884)
| -rw-r--r-- | etc/evergreen.yml | 3 | ||||
| -rw-r--r-- | version.json | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 24b8ed95679..64a121b88ca 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -245,8 +245,7 @@ tasks: rm -rf ${install_directory|/data/mongo-install-directory} ${scons|scons} ${compile_flags|} --use-new-tools all dist distsrc-${ext|tgz} ${msi_target|} - ${python|python} buildscripts/generate_compile_expansions.py version.json | \ - tee compile_expansions.yml + ${gitvars} git describe | ${python|python} buildscripts/generate_compile_expansions.py | tee compile_expansions.yml if [ "${has_debugsymbols|}" = "true" ]; then ${scons|scons} ${compile_flags|} --nostrip --use-new-tools dist; original_filename=$(ls | grep debugsymbols); mv $original_filename $(echo $original_filename | sed 's/debugsymbols-//' | sed 's/mongodb/debugsymbols-mongodb/'); fi ${asan_symbolizer} ${enable_lsan} ${python|python} buildscripts/smoke.py --with-cleanbb --mode files --from-file build/unittests.txt --dont-start-mongod --report-file report.json core diff --git a/version.json b/version.json deleted file mode 100644 index f8e08560126..00000000000 --- a/version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "3.0.8-pre-" -} |