Skip to content

Commit ee2ca7c

Browse files
authored
Merge pull request #3818 from djmitche/fix-docker-release
fix docker-worker's release.sh
2 parents 4f19d75 + 2903dac commit ee2ca7c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

changelog/ZdTx8PtwSXePP6NmvZut0Q.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
audience: developers
2+
level: patch
3+
---
4+
This version fixes an error in docker-worker's release script that caused the 38.0.0 release to fail.

workers/docker-worker/release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ for f in src schemas .npmignore package.json yarn.lock config.yml bin-utils; do
2929
done
3030

3131
# Install Node
32-
# TODO: use the same node version as everything else, bug 1636164
3332
NODE_VERSION=$(echo "console.log(require('./package.json').engines.node)" | node)
3433
mkdir $DW_ROOT/node
3534
curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz | tar -C $DW_ROOT/node --strip-components=1 -xJf -
@@ -41,7 +40,8 @@ curl -L https://yarnpkg.com/latest.tar.gz | tar --transform 's|yarn-[^/]*/|yarn/
4140
PATH=$DW_ROOT/node/bin:$DW_ROOT/node_modules/.bin:$PATH
4241
(
4342
cd $DW_ROOT
44-
./yarn/bin/yarn install --dev
43+
# --ignore-engines is to ignore if we're using the wrong version of yarn
44+
./yarn/bin/yarn install --dev --ignore-engines
4545
)
4646

4747
# Clean up some stuff

0 commit comments

Comments
 (0)