diff options
| author | Ernie Hershey <ernie.hershey@10gen.com> | 2015-10-30 14:14:57 -0400 |
|---|---|---|
| committer | Ernie Hershey <ernie.hershey@10gen.com> | 2015-10-30 15:07:17 -0400 |
| commit | 0c48b420af604e19deb1ad31d014aae0477b7884 (patch) | |
| tree | 84f9a66da84fe753d14f735eb790ce3d68006bfa | |
| parent | 9ac7b65d0e33ac778a0c9febf96f04ee54570fbc (diff) | |
| download | mongo-0c48b420af604e19deb1ad31d014aae0477b7884.tar.gz | |
SERVER-21224 Use "git describe" instead of version.json
| -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 b04afa6c512..17c44e3d6e9 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -380,8 +380,7 @@ tasks: rm -rf ${install_directory|/data/mongo-install-directory} ${scons|scons} ${compile_flags|} --use-new-tools all dist dist-debugsymbols 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 mv mongodb-src-*.${ext|tgz} distsrc.${ext|tgz} mv mongodb-*-debugsymbols.${ext|tgz} mongo-debugsymbols.tgz || true diff --git a/version.json b/version.json deleted file mode 100644 index 8c9cc5a634e..00000000000 --- a/version.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "3.2.0-rc2-pre-" -} |