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

wip: fix git merge [skip ci]

Browse source
This commit is contained in:
Baptiste Augrain 2023-10-05 17:25:23 +02:00
parent fc7ef66af4
commit 5e61d7d3db
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
prepare_vscode.sh
View file

@ -74,8 +74,8 @@ else
mkdir -p .build/node-gyp mkdir -p .build/node-gyp
cd .build/node-gyp cd .build/node-gyp
git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com" git config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
git config user.name "${GITHUB_USERNAME} CI" git config --global user.name "${GITHUB_USERNAME} CI"
git clone https://github.com/nodejs/node-gyp.git . git clone https://github.com/nodejs/node-gyp.git .
git checkout v9.4.0 git checkout v9.4.0
git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch