diff options
| author | Mikhail Shchatko <mikhail.shchatko@mongodb.com> | 2021-12-03 17:28:51 +0300 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-14 08:24:39 +0000 |
| commit | b027fafb2869c9aa06baaa1d6c02c0e55330b356 (patch) | |
| tree | 3e9a61826ca473910fbf4a687dde3791458de9e9 /evergreen | |
| parent | 81207cf643f9acd98663f07f3943e0e3557bdb29 (diff) | |
| download | mongo-b027fafb2869c9aa06baaa1d6c02c0e55330b356.tar.gz | |
SERVER-60210 Add future git tag buildvariant
Diffstat (limited to 'evergreen')
| -rw-r--r-- | evergreen/functions/add_git_tag.sh | 14 | ||||
| -rw-r--r-- | evergreen/multiversion_setup.sh | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/evergreen/functions/add_git_tag.sh b/evergreen/functions/add_git_tag.sh index 43f583e3132..c4619317fe5 100644 --- a/evergreen/functions/add_git_tag.sh +++ b/evergreen/functions/add_git_tag.sh @@ -3,9 +3,17 @@ cd src set -o errexit set -o verbose -tag="$future_git_tag" +tag="" +if [ -n "$bv_future_git_tag" ]; then + tag="$bv_future_git_tag" +fi +if [ -n "$future_git_tag" ]; then + tag="$future_git_tag" +fi + echo "TAG: $tag" -if [[ ! -z $tag ]]; then + +if [ -n "$tag" ]; then if [ "Windows_NT" = "$OS" ]; then # On Windows, we don't seem to have a local git identity, so we populate the config with this # dummy email and name. Without a configured email/name, the 'git tag' command will fail. @@ -13,5 +21,5 @@ if [[ ! -z $tag ]]; then git config user.name "Evergreen Agent" fi - git tag -a $tag -m $tag + git tag -a "$tag" -m "$tag" fi diff --git a/evergreen/multiversion_setup.sh b/evergreen/multiversion_setup.sh index 6e337fcf385..c6f51c9ef11 100644 --- a/evergreen/multiversion_setup.sh +++ b/evergreen/multiversion_setup.sh @@ -83,4 +83,4 @@ $python buildscripts/resmoke.py setup-multiversion \ --architecture $architecture \ --useLatest \ $last_lts_arg \ - $last_continuous_arg 4.4 + $last_continuous_arg 4.4 5.1 |