Skip to content

Commit 4fdfe73

Browse files
committed
fix: remove redundant skip download env variables
1 parent 023021a commit 4fdfe73

File tree

6 files changed

+7
-13
lines changed

6 files changed

+7
-13
lines changed

.evergreen.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4310,7 +4310,6 @@ functions:
43104310
{
43114311
export NODE_JS_VERSION=${node_js_version}
43124312
source .evergreen/setup-env.sh
4313-
export PUPPETEER_SKIP_DOWNLOAD="true"
43144313
npm run evergreen-release draft
43154314
git add .
43164315
git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
@@ -4330,7 +4329,6 @@ functions:
43304329
node_js_version: ${node_js_version}
43314330
script: |
43324331
set -e
4333-
export PUPPETEER_SKIP_DOWNLOAD="true"
43344332
.evergreen/run-evergreen-release.sh download-and-list-artifacts
43354333
- command: shell.exec
43364334
params:
@@ -4359,7 +4357,6 @@ functions:
43594357
node_js_version: ${node_js_version}
43604358
script: |
43614359
set -e
4362-
export PUPPETEER_SKIP_DOWNLOAD="true"
43634360
.evergreen/run-evergreen-release.sh publish -- --dry-run
43644361
43654362
release_publish:
@@ -4378,7 +4375,6 @@ functions:
43784375
node_js_version: ${node_js_version}
43794376
script: |
43804377
set -e
4381-
export PUPPETEER_SKIP_DOWNLOAD="true"
43824378
.evergreen/run-evergreen-release.sh publish
43834379
43844380
run_perf_tests:

.evergreen/compile-artifact.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ trap "rm -rf /tmp/m" EXIT
2222
export TMP=/tmp/m
2323
export TMPDIR=/tmp/m
2424

25-
if [ `uname` = Darwin ]; then
25+
if [ $(uname) = Darwin ]; then
2626
# match what Node.js 20 does on their own builder machines
2727
export CFLAGS='-mmacosx-version-min=10.15'
2828
export CXXFLAGS='-mmacosx-version-min=10.15'
@@ -76,7 +76,6 @@ elif [ -n "$MONGOSH_SHARED_OPENSSL" ]; then
7676
export LD_LIBRARY_PATH=/opt/devtools/lib:/tmp/m/opt/lib
7777
fi
7878

79-
export PUPPETEER_SKIP_DOWNLOAD="true"
8079
npm run evergreen-release compile
8180
dist/mongosh --version
8281
dist/mongosh --build-info

.evergreen/evergreen.yml.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -955,7 +955,6 @@ functions:
955955
{
956956
export NODE_JS_VERSION=${node_js_version}
957957
source .evergreen/setup-env.sh
958-
export PUPPETEER_SKIP_DOWNLOAD="true"
959958
npm run evergreen-release draft
960959
git add .
961960
git commit --no-allow-empty -m "chore(release): bump to prepare for mongosh release"
@@ -975,7 +974,6 @@ functions:
975974
node_js_version: ${node_js_version}
976975
script: |
977976
set -e
978-
export PUPPETEER_SKIP_DOWNLOAD="true"
979977
.evergreen/run-evergreen-release.sh download-and-list-artifacts
980978
- command: shell.exec
981979
params:
@@ -1004,7 +1002,6 @@ functions:
10041002
node_js_version: ${node_js_version}
10051003
script: |
10061004
set -e
1007-
export PUPPETEER_SKIP_DOWNLOAD="true"
10081005
.evergreen/run-evergreen-release.sh publish -- --dry-run
10091006

10101007
release_publish:
@@ -1023,7 +1020,6 @@ functions:
10231020
node_js_version: ${node_js_version}
10241021
script: |
10251022
set -e
1026-
export PUPPETEER_SKIP_DOWNLOAD="true"
10271023
.evergreen/run-evergreen-release.sh publish
10281024

10291025
run_perf_tests:

.evergreen/package-and-upload-artifact.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ "$(uname)" == Linux ]; then
1313
cp "$(pwd)/../tmp/expansions.yaml" tmp/expansions.yaml
1414
(cd scripts/docker && bash "$BASEDIR/retry-with-backoff.sh" docker build -t rocky8-package -f rocky8-package.Dockerfile .)
1515
echo Starting Docker container packaging
16-
docker run -e PUPPETEER_SKIP_DOWNLOAD \
16+
docker run \
1717
-e EVERGREEN_EXPANSIONS_PATH=/tmp/build/tmp/expansions.yaml \
1818
-e NODE_JS_VERSION \
1919
-e PACKAGE_VARIANT \
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#! /usr/bin/env bash
22
set -e
33

4-
echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" > .npmrc
4+
echo "//registry.npmjs.org/:_authToken=${devtoolsbot_npm_token}" >.npmrc
55
set -x
66
export NODE_JS_VERSION=${node_js_version}
77
source .evergreen/setup-env.sh
8-
export PUPPETEER_SKIP_DOWNLOAD="true"
98
npm run evergreen-release $@

packages/build/src/npm-packages/bump.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ export class PackageBumper {
8181
stdio: 'inherit',
8282
cwd: monorepoRootPath,
8383
encoding: 'utf8',
84+
env: {
85+
...process.env,
86+
PUPPETEER_SKIP_DOWNLOAD: 'true',
87+
},
8488
});
8589
}
8690

0 commit comments

Comments
 (0)