mirror of
https://github.com/VSCodium/vscodium.git
synced 2026-04-13 20:28:18 +10:00
wip: fix git merge [skip ci]
This commit is contained in:
@@ -74,6 +74,8 @@ else
|
||||
mkdir -p .build/node-gyp
|
||||
cd .build/node-gyp
|
||||
|
||||
git config user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com"
|
||||
git config user.name "${GITHUB_USERNAME} CI"
|
||||
git clone https://github.com/nodejs/node-gyp.git .
|
||||
git checkout v9.4.0
|
||||
git am --3way --whitespace=fix ../../build/npm/gyp/patches/gyp_spectre_mitigation_support.patch
|
||||
|
||||
Reference in New Issue
Block a user