mirror of
https://github.com/VSCodium/vscodium.git
synced 2026-04-22 02:50:14 +10:00
build(linux): update node-v16 patch [skip ci]
This commit is contained in:
@@ -58,3 +58,23 @@ if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
for FILE in ../patches/linux/*.patch; do
|
||||
if [[ -f "${FILE}" ]]; then
|
||||
echo applying patch: "${FILE}"
|
||||
if ! git apply --ignore-whitespace "${FILE}"; then
|
||||
echo failed to apply patch "${FILE}"
|
||||
|
||||
git apply --reject "${FILE}"
|
||||
git apply --reject "../patches/helper/settings.patch"
|
||||
|
||||
read -rp "Press any key when the conflict have been resolved..." -n1 -s
|
||||
|
||||
git restore .vscode/settings.json
|
||||
git add .
|
||||
git diff --staged -U1 > "${FILE}"
|
||||
fi
|
||||
git add .
|
||||
git reset -q --hard HEAD
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user