Parker2991/vscodium
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wip: use patched node-gyp [skip ci]

Browse source
This commit is contained in:
Baptiste Augrain 2023-10-05 16:44:52 +02:00
parent dd84d4841a
commit 8de14b5c6a
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/stable-windows.yml vendored
View file

@ -33,7 +33,7 @@ env:
jobs: jobs:
build: build:
runs-on: windows-latest runs-on: windows-2019
defaults: defaults:
run: run:
shell: bash shell: bash

13
prepare_vscode.sh
View file

@ -67,17 +67,16 @@ if [[ "${OS_NAME}" == "osx" ]]; then
yarn postinstall yarn postinstall
else else
if [[ "${npm_config_arch}" == "arm" ]]; then if [[ "${OS_NAME}" == "windows" ]]; then
export npm_config_arm_version=7
elif [[ "${npm_config_arch}" == "ia32" ]]; then
# TODO: Should be replaced with upstream URL once https://github.com/nodejs/node-gyp/pull/2825 # TODO: Should be replaced with upstream URL once https://github.com/nodejs/node-gyp/pull/2825
# gets merged. # gets merged.
rm -rf .build/node-gyp rm -rf .build/node-gyp
mkdir -p .build/node-gyp mkdir -p .build/node-gyp
cd .build/node-gyp cd .build/node-gyp
git clone https://github.com/rzhao271/node-gyp.git . git clone https://github.com/nodejs/node-gyp.git .
git checkout 102b347da0c92c29f9c67df22e864e70249cf086 git checkout v9.4.0
git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch
npm install npm install
npm_config_node_gyp=$( pwd ) npm_config_node_gyp=$( pwd )
@ -86,6 +85,10 @@ else
cd ../.. cd ../..
fi fi
if [[ "${npm_config_arch}" == "arm" ]]; then
export npm_config_arm_version=7
fi
CHILD_CONCURRENCY=1 yarn --frozen-lockfile --network-timeout 180000 CHILD_CONCURRENCY=1 yarn --frozen-lockfile --network-timeout 180000
fi fi