diff --git a/.evergreen.yml b/.evergreen.yml index bfa2564ef..895ca6cb8 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -11023,8 +11023,6 @@ tasks: mongosh_test_force_api_strict: "1" - name: compile_artifact tags: ["compile-artifact"] - vars: - distro_id: ${distro_id} depends_on: - name: compile_ts variant: linux_unit @@ -11036,7 +11034,6 @@ tasks: - func: compile_artifact vars: node_js_version: "20.18.0" - distro_id: ${distro_id} - func: upload_compiled_artifact vars: node_js_version: "20.18.0" diff --git a/.evergreen/compile-artifact.sh b/.evergreen/compile-artifact.sh index 2d3f93250..d04e97cc5 100755 --- a/.evergreen/compile-artifact.sh +++ b/.evergreen/compile-artifact.sh @@ -22,7 +22,7 @@ trap "rm -rf /tmp/m" EXIT export TMP=/tmp/m export TMPDIR=/tmp/m -if [ $(uname) = Darwin ]; then +if [ `uname` = Darwin ]; then # match what Node.js 20 does on their own builder machines export CFLAGS='-mmacosx-version-min=10.15' export CXXFLAGS='-mmacosx-version-min=10.15' diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index fff0e7224..c0827f931 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -1171,8 +1171,6 @@ tasks: mongosh_test_force_api_strict: "1" - name: compile_artifact tags: ["compile-artifact"] - vars: - distro_id: ${distro_id} depends_on: - name: compile_ts variant: linux_unit @@ -1184,7 +1182,6 @@ tasks: - func: compile_artifact vars: node_js_version: "<% out(NODE_JS_VERSION_20) %>" - distro_id: ${distro_id} - func: upload_compiled_artifact vars: node_js_version: "<% out(NODE_JS_VERSION_20) %>" diff --git a/.evergreen/install-npm-deps.sh b/.evergreen/install-npm-deps.sh index 4a2cf4c3e..c6841d3f8 100644 --- a/.evergreen/install-npm-deps.sh +++ b/.evergreen/install-npm-deps.sh @@ -1,7 +1,6 @@ set -e set -x -echo "DISTRO ID: ${DISTRO_ID}" if [[ "${DISTRO_ID}" =~ ^(rhel) ]]; then # force because of issues with peer deps and semver pre-releases, # install rather than ci because `npm ci` can only install packages when your