Skip to content

Commit 4b7c2ea

Browse files
committed
Use static version of node for all builds, not just darwin
This way, building a standalone release locally and putting it in the release contianer for testing is less likely to break.
1 parent 4c4a741 commit 4b7c2ea

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

ci/build/clean.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ main() {
1313
release-gcp \
1414
release-images \
1515
dist \
16-
.cache
16+
.cache \
17+
node-*
1718

1819
pushd lib/vscode
1920
git clean -xffd

ci/steps/release-packages.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ set -euo pipefail
44
main() {
55
cd "$(dirname "$0")/../.."
66

7-
if [[ $OSTYPE == darwin* ]]; then
8-
NODE_VERSION=v12.18.3
9-
curl -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-darwin-x64.tar.gz" | tar -xz
10-
PATH="$PWD/node-$NODE_VERSION-darwin-x64/bin:$PATH"
11-
fi
7+
NODE_VERSION=v12.18.3
8+
NODE_OS="$(uname | tr '[:upper:]' '[:lower:]')"
9+
NODE_ARCH="$(uname -m | sed 's/86_64/64/; s/aarch64/arm64/')"
10+
curl -L "https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$NODE_OS-$NODE_ARCH.tar.gz" | tar -xz
11+
PATH="$PWD/node-$NODE_VERSION-$NODE_OS-$NODE_ARCH/bin:$PATH"
1212

1313
# https://github.com/actions/upload-artifact/issues/38
1414
tar -xzf release-npm-package/package.tar.gz

0 commit comments

Comments
 (0)