From 1341b7b7afeec02350b1e3a3fbac946a243ac5b1 Mon Sep 17 00:00:00 2001 From: Baptiste Augrain Date: Mon, 19 Feb 2024 21:52:42 +0100 Subject: [PATCH] ci(linux): try fixing arm32 and ppc64 [skip ci] --- patches/linux/armhf/yarn-build.patch | 19 +++++++++-------- patches/linux/ppc64le/disable-sysroot.patch | 23 +++++++++++++++++++++ patches/linux/ppc64le/yarn-build.patch | 19 +++++++++-------- 3 files changed, 43 insertions(+), 18 deletions(-) create mode 100644 patches/linux/ppc64le/disable-sysroot.patch diff --git a/patches/linux/armhf/yarn-build.patch b/patches/linux/armhf/yarn-build.patch index 813a771..08f261b 100644 --- a/patches/linux/armhf/yarn-build.patch +++ b/patches/linux/armhf/yarn-build.patch @@ -1,19 +1,20 @@ diff --git a/.yarnrc b/.yarnrc -index 6d69893..5568071 100644 +index 6d69893..849e761 100644 --- a/.yarnrc +++ b/.yarnrc -@@ -3,3 +3 @@ target "27.2.3" +@@ -3,3 +3,3 @@ target "27.2.3" ms_build_id "26908389" -runtime "electron" -build_from_source "true" ++#runtime "electron" ++#build_from_source "true" diff --git a/remote/.yarnrc b/remote/.yarnrc -deleted file mode 100644 -index cac528f..0000000 +index cac528f..0f997ad 100644 --- a/remote/.yarnrc -+++ /dev/null -@@ -1,5 +0,0 @@ --disturl "https://nodejs.org/dist" --target "16.20.2" --ms_build_id "255375" ++++ b/remote/.yarnrc +@@ -3,3 +3,3 @@ target "18.17.1" + ms_build_id "255375" -runtime "node" -build_from_source "true" ++#runtime "node" ++#build_from_source "true" diff --git a/patches/linux/ppc64le/disable-sysroot.patch b/patches/linux/ppc64le/disable-sysroot.patch new file mode 100644 index 0000000..26fb570 --- /dev/null +++ b/patches/linux/ppc64le/disable-sysroot.patch @@ -0,0 +1,23 @@ +diff --git a/build/azure-pipelines/linux/install.sh b/build/azure-pipelines/linux/install.sh +index 57f5876..2d543e5 100755 +--- a/build/azure-pipelines/linux/install.sh ++++ b/build/azure-pipelines/linux/install.sh +@@ -7,10 +7,12 @@ yarn config set registry "$NPM_REGISTRY" + +-SYSROOT_ARCH=$VSCODE_ARCH +-if [ "$SYSROOT_ARCH" == "x64" ]; then +- SYSROOT_ARCH="amd64" ++if [ "$npm_config_arch" != "ppc64" ]; then ++ SYSROOT_ARCH=$VSCODE_ARCH ++ if [ "$SYSROOT_ARCH" == "x64" ]; then ++ SYSROOT_ARCH="amd64" ++ fi ++ ++ export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots ++ SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' + fi + +-export VSCODE_SYSROOT_DIR=$PWD/.build/sysroots +-SYSROOT_ARCH="$SYSROOT_ARCH" node -e '(async () => { const { getVSCodeSysroot } = require("./build/linux/debian/install-sysroot.js"); await getVSCodeSysroot(process.env["SYSROOT_ARCH"]); })()' +- + if [ "$npm_config_arch" == "x64" ]; then diff --git a/patches/linux/ppc64le/yarn-build.patch b/patches/linux/ppc64le/yarn-build.patch index 813a771..08f261b 100644 --- a/patches/linux/ppc64le/yarn-build.patch +++ b/patches/linux/ppc64le/yarn-build.patch @@ -1,19 +1,20 @@ diff --git a/.yarnrc b/.yarnrc -index 6d69893..5568071 100644 +index 6d69893..849e761 100644 --- a/.yarnrc +++ b/.yarnrc -@@ -3,3 +3 @@ target "27.2.3" +@@ -3,3 +3,3 @@ target "27.2.3" ms_build_id "26908389" -runtime "electron" -build_from_source "true" ++#runtime "electron" ++#build_from_source "true" diff --git a/remote/.yarnrc b/remote/.yarnrc -deleted file mode 100644 -index cac528f..0000000 +index cac528f..0f997ad 100644 --- a/remote/.yarnrc -+++ /dev/null -@@ -1,5 +0,0 @@ --disturl "https://nodejs.org/dist" --target "16.20.2" --ms_build_id "255375" ++++ b/remote/.yarnrc +@@ -3,3 +3,3 @@ target "18.17.1" + ms_build_id "255375" -runtime "node" -build_from_source "true" ++#runtime "node" ++#build_from_source "true"