diff --git a/.evergreen/setup-env.sh b/.evergreen/setup-env.sh index ae19b9ff1..d4475a2d5 100755 --- a/.evergreen/setup-env.sh +++ b/.evergreen/setup-env.sh @@ -1,7 +1,7 @@ set -e set -x export BASEDIR="$PWD/.evergreen" -export PATH="$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-8/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/python/3.6/bin:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/python/Python310/Scripts:/cygdrive/c/python/Python310:/cygdrive/c/Python310/Scripts:/cygdrive/c/Python310:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH" +export PATH="/cygdrive/c/python/Python311/Scripts:/cygdrive/c/python/Python311:/cygdrive/c/Python311/Scripts:/cygdrive/c/Python311:/opt/python/3.6/bin:$BASEDIR/mingit/cmd:$BASEDIR/mingit/mingw64/libexec/git-core:$BASEDIR/git-2:$BASEDIR/npm-8/node_modules/.bin:$BASEDIR/node-v$NODE_JS_VERSION-win-x64:/opt/java/jdk16/bin:/opt/chefdk/gitbin:/cygdrive/c/cmake/bin:/opt/mongodbtoolchain/v3/bin:$PATH" export IS_MONGOSH_EVERGREEN_CI=1 if [ "$OS" != "Windows_NT" ]; then @@ -66,16 +66,19 @@ echo "Full path:" echo $PATH echo "Using node version:" -node --version +(which node && node --version) echo "Using npm version:" -npm --version +(which npm && npm --version) echo "Using git version:" -git --version +(which git && git --version) echo "Using python version:" -python --version +(which python && python --version) || true + +echo "Using python3 version:" +(which python3 && python3 --version) || true echo "Node.js OS info:" node -p '[os.arch(), os.platform(), os.endianness(), os.type(), os.release()]' diff --git a/testing/integration-testing-hooks.ts b/testing/integration-testing-hooks.ts index f6eb45b34..e5b741c7d 100644 --- a/testing/integration-testing-hooks.ts +++ b/testing/integration-testing-hooks.ts @@ -56,6 +56,9 @@ async function tryExtensions(base: string): Promise<[ string, Error ]> { async function findPython3() { try { + if (process.env.DISTRO_ID?.startsWith('windows-')) { + throw new Error('python3 on Windows in evergreen CI is broken but `python` is working python3'); + } await which('python3'); return 'python3'; } catch {