From 09160dfd7e799cc2ac37943c85c0c8a05d23b3cc Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 1 Feb 2021 13:10:32 +0100 Subject: [PATCH 1/2] chore(ci): use git 2.x on RHEL hosts --- .evergreen/.setup_env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.evergreen/.setup_env b/.evergreen/.setup_env index 289e056c54..7d0c7dcbba 100755 --- a/.evergreen/.setup_env +++ b/.evergreen/.setup_env @@ -1,7 +1,7 @@ set -e set -x export BASEDIR="$PWD/.evergreen" -export PATH="$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/python/3.6/bin/:/cygdrive/c/Python39/Scripts:/cygdrive/c/Python39:/cygdrive/c/cmake/bin:$PATH" +export PATH="$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/python/3.6/bin:/opt/chefdk/gitbin:/cygdrive/c/Python39/Scripts:/cygdrive/c/Python39:/cygdrive/c/cmake/bin:$PATH" if [ "$OS" != "Windows_NT" ]; then export NVM_DIR="$HOME/.nvm" From 0fc44cd7a3366c753e6ae3887b7db6d0083aa509 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Mon, 1 Feb 2021 14:03:33 +0100 Subject: [PATCH 2/2] fixup! chore(ci): use git 2.x on RHEL hosts --- .evergreen/.setup_env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.evergreen/.setup_env b/.evergreen/.setup_env index 7d0c7dcbba..c31125f6c9 100755 --- a/.evergreen/.setup_env +++ b/.evergreen/.setup_env @@ -15,6 +15,9 @@ node --version echo "Using npm version:" npm --version +echo "Using git version:" +git --version + export EVERGREEN_EXPANSIONS_PATH="$BASEDIR/../../tmp/expansions.yaml" if [ "$OS" == "Windows_NT" ]; then