mirror of
https://github.com/VSCodium/vscodium.git
synced 2026-04-22 02:50:14 +10:00
feat(1.94): update patches and build process (#2047)
This commit is contained in:
@@ -52,7 +52,7 @@ fi
|
||||
|
||||
export VSCODE_REMOTE_DEPENDENCIES_CONTAINER_NAME
|
||||
|
||||
sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.yarnrc
|
||||
sed -i "/target/s/\"20.*\"/\"${NODE_VERSION}\"/" remote/.npmrc
|
||||
|
||||
if [[ "${NODE_VERSION}" != 16* ]]; then
|
||||
if [[ -f "../patches/linux/reh/node16.patch" ]]; then
|
||||
@@ -73,12 +73,12 @@ if [[ -d "../patches/linux/reh/" ]]; then
|
||||
fi
|
||||
|
||||
for i in {1..5}; do # try 5 times
|
||||
yarn --cwd build --frozen-lockfile --check-files && break
|
||||
npm ci --prefix build && break
|
||||
if [[ $i == 3 ]]; then
|
||||
echo "Yarn failed too many times" >&2
|
||||
echo "Npm install failed too many times" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Yarn failed $i, trying again..."
|
||||
echo "Npm install failed $i, trying again..."
|
||||
done
|
||||
|
||||
if [[ "${VSCODE_ARCH}" == "ppc64le" ]]; then
|
||||
@@ -88,12 +88,12 @@ else
|
||||
fi
|
||||
|
||||
for i in {1..5}; do # try 5 times
|
||||
yarn --frozen-lockfile --check-files && break
|
||||
if [ $i -eq 3 ]; then
|
||||
echo "Yarn failed too many times" >&2
|
||||
npm ci && break
|
||||
if [[ $i == 3 ]]; then
|
||||
echo "Npm install failed too many times" >&2
|
||||
exit 1
|
||||
fi
|
||||
echo "Yarn failed $i, trying again..."
|
||||
echo "Npm install failed $i, trying again..."
|
||||
done
|
||||
|
||||
node build/azure-pipelines/distro/mixin-npm
|
||||
|
||||
Reference in New Issue
Block a user