diff options
| -rw-r--r-- | etc/evergreen.yml | 4 | ||||
| -rwxr-xr-x | src/mongo/gotools/src/github.com/mongodb/mongo-tools/set_goenv.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index ef6b7841f3d..a2eb7f5c70d 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -537,7 +537,7 @@ functions: ### SPLUNK #sed -i.bak "s/built-without-version-string/3.6.17-SERVER-42525-splunk/" common/options/options.go - sed -i.bak "s/built-without-version-string/3.6.17-linux-splunk-v3/" common/options/options.go + sed -i.bak "s/built-without-version-string/3.6.17-linux-splunk-v4/" common/options/options.go sed -i.bak "s/built-without-git-spec/$(git rev-parse HEAD)/" common/options/options.go # Move the vendor source to make compatible with gccgo @@ -884,7 +884,7 @@ functions: # We get the raw version string (r1.2.3-45-gabcdef) from git ### MONGO_VERSION=$(git describe) ### SPLUNK - MONGO_VERSION=3.6.17-linux-splunk-v3 + MONGO_VERSION=3.6.17-linux-splunk-v4 # 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 ### SPLUNK Get rid of the below block diff --git a/src/mongo/gotools/src/github.com/mongodb/mongo-tools/set_goenv.sh b/src/mongo/gotools/src/github.com/mongodb/mongo-tools/set_goenv.sh index f8253064879..bb05a989015 100755 --- a/src/mongo/gotools/src/github.com/mongodb/mongo-tools/set_goenv.sh +++ b/src/mongo/gotools/src/github.com/mongodb/mongo-tools/set_goenv.sh @@ -82,7 +82,9 @@ set_goenv() { } print_ldflags() { - VersionStr="$(git describe)" + # VersionStr="$(git describe)" + # SPLUNK + VersionStr="3.6.17-linux-splunk-v4" Gitspec="$(git rev-parse HEAD)" importpath="github.com/mongodb/mongo-tools/common/options" echo "-X ${importpath}.VersionStr=${VersionStr} -X ${importpath}.Gitspec=${Gitspec}" |