diff --git a/.evergreen.yml b/.evergreen.yml index 31c083a33..1c5efc4cd 100644 --- a/.evergreen.yml +++ b/.evergreen.yml @@ -7132,7 +7132,7 @@ functions: { export NODE_JS_VERSION=${node_js_version} source .evergreen/setup-env.sh - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" npm run evergreen-release draft } @@ -7150,7 +7150,7 @@ functions: node_js_version: ${node_js_version} script: | set -e - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" .evergreen/run-evergreen-release.sh download-and-list-artifacts - command: shell.exec params: @@ -7179,7 +7179,7 @@ functions: node_js_version: ${node_js_version} script: | set -e - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" .evergreen/run-evergreen-release.sh publish -- --dry-run release_publish: @@ -7198,7 +7198,7 @@ functions: node_js_version: ${node_js_version} script: | set -e - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" .evergreen/run-evergreen-release.sh publish run_perf_tests: diff --git a/.evergreen/compile-artifact.sh b/.evergreen/compile-artifact.sh index d04e97cc5..eaac9d5a9 100755 --- a/.evergreen/compile-artifact.sh +++ b/.evergreen/compile-artifact.sh @@ -73,7 +73,7 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then export LD_LIBRARY_PATH=/tmp/m/opt/lib fi -export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" +export PUPPETEER_SKIP_DOWNLOAD="true" npm run evergreen-release compile dist/mongosh --version dist/mongosh --build-info diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in index ae96b4da0..90d5fa18d 100644 --- a/.evergreen/evergreen.yml.in +++ b/.evergreen/evergreen.yml.in @@ -967,7 +967,7 @@ functions: { export NODE_JS_VERSION=${node_js_version} source .evergreen/setup-env.sh - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" npm run evergreen-release draft } @@ -985,7 +985,7 @@ functions: node_js_version: ${node_js_version} script: | set -e - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" .evergreen/run-evergreen-release.sh download-and-list-artifacts - command: shell.exec params: @@ -1014,7 +1014,7 @@ functions: node_js_version: ${node_js_version} script: | set -e - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" .evergreen/run-evergreen-release.sh publish -- --dry-run release_publish: @@ -1033,7 +1033,7 @@ functions: node_js_version: ${node_js_version} script: | set -e - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" + export PUPPETEER_SKIP_DOWNLOAD="true" .evergreen/run-evergreen-release.sh publish run_perf_tests: diff --git a/.evergreen/package-and-upload-artifact.sh b/.evergreen/package-and-upload-artifact.sh index 8fb1fbff2..963858d6d 100755 --- a/.evergreen/package-and-upload-artifact.sh +++ b/.evergreen/package-and-upload-artifact.sh @@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml (cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .) echo Starting Docker container packaging - docker run -e PUPPETEER_SKIP_CHROMIUM_DOWNLOAD \ + docker run -e PUPPETEER_SKIP_DOWNLOAD \ -e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \ -e NODE_JS_VERSION \ -e PACKAGE_VARIANT \ diff --git a/.evergreen/run-evergreen-release.sh b/.evergreen/run-evergreen-release.sh index fb454d1dc..53e622c27 100755 --- a/.evergreen/run-evergreen-release.sh +++ b/.evergreen/run-evergreen-release.sh @@ -5,5 +5,5 @@ echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc set -x export NODE_JS_VERSION=${node_js_version} source .evergreen/setup-env.sh -export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD="true" +export PUPPETEER_SKIP_DOWNLOAD="true" npm run evergreen-release $@ diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 59ed0204d..39d2a7054 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -20,6 +20,7 @@ jobs: env: npm_config_loglevel: verbose npm_config_foreground_scripts: "true" + PUPPETEER_SKIP_DOWNLOAD: "true" steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -30,8 +31,8 @@ jobs: - name: Install npm@10 run: npm install -g npm@10 - - name: Bootstrap - run: npm run bootstrap + - name: Install dependencies + run: npm ci - name: Run smoke tests run: npm run test-smoke diff --git a/package.json b/package.json index 253528211..2d92a1368 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "author": "Compass Team ", "scripts": { "bootstrap-with-chromium": "npm install && npm run compile", - "bootstrap": "npx cross-env PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 npm install && npm run compile", + "bootstrap": "npx cross-env PUPPETEER_SKIP_DOWNLOAD=1 npm install && npm run compile", "clean": "lerna clean -y && rm -Rf node_modules", "check": "lerna run check --since HEAD --exclude-dependents", "check-ci": "npm run check --workspaces --if-present",