diff --git a/evergreen/generate_evergreen_bazelrc.sh b/evergreen/generate_evergreen_bazelrc.sh index 1a3fe7172ad..34b53986146 100644 --- a/evergreen/generate_evergreen_bazelrc.sh +++ b/evergreen/generate_evergreen_bazelrc.sh @@ -23,9 +23,11 @@ if [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "win32" ]]; then abs_path=$(cygpath -w "$TMPDIR" | tr '\\' '/') echo "startup --output_user_root=Z:/bazel_tmp" > .bazelrc.evergreen echo "BAZELISK_HOME=${abs_path}/bazelisk_home" >> .bazeliskrc + echo "build --define GIT_COMMIT_HASH=$(git rev-parse HEAD)" >> .bazelrc.gitinfo else echo "startup --output_user_root=${TMPDIR}/bazel-output-root" > .bazelrc.evergreen echo "BAZELISK_HOME=${TMPDIR}/bazelisk_home" >> .bazeliskrc + echo "build --define GIT_COMMIT_HASH=$(git rev-parse HEAD)" >> .bazelrc.gitinfo fi uri="https://spruce.mongodb.com/task/${task_id:?}?execution=${execution:?}" diff --git a/tools/bazel b/tools/bazel index d0c474f41bc..36131cf716b 100755 --- a/tools/bazel +++ b/tools/bazel @@ -19,12 +19,6 @@ if [[ -z "${BAZELISK_SKIP_WRAPPER}" ]]; then exit 0 fi -# TODO(SERVER-96398): Apply this to Windows when we find a way to do perfect argument forwarding -# in a batch file. -if [ -d .git ]; then - echo "build --define GIT_COMMIT_HASH=$(git rev-parse HEAD)" > .bazelrc.gitinfo -fi - if [[ $OSTYPE == darwin* ]]; then echo "Running on Apple (darwin), creating .bazelrc for xcode settings." >&2 xcode_path=$(xcode-select -p) >&2