From 5e61d7d3db23101e37f5bc0732ad0a860f7a097d Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Thu, 5 Oct 2023 17:25:23 +0200 Subject: [PATCH] wip: fix git merge [skip ci] --- prepare_vscode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prepare_vscode.sh b/prepare_vscode.sh index 384cd77..4ec366c 100755 --- a/prepare_vscode.sh +++ b/prepare_vscode.sh @@ -74,8 +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 config --global user.email "$( echo "${GITHUB_USERNAME}" | awk '{print tolower($0)}' )-ci@not-real.com" + git config --global 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