mirror of
https://github.com/VSCodium/vscodium.git
synced 2024-12-23 08:52:43 +03:00
ci(linux): try fixing arm32 and ppc64 [skip ci]
This commit is contained in:
parent
096bb6e6d7
commit
1341b7b7af
@ -1,19 +1,20 @@
|
|||||||
diff --git a/.yarnrc b/.yarnrc
|
diff --git a/.yarnrc b/.yarnrc
|
||||||
index 6d69893..5568071 100644
|
index 6d69893..849e761 100644
|
||||||
--- a/.yarnrc
|
--- a/.yarnrc
|
||||||
+++ b/.yarnrc
|
+++ b/.yarnrc
|
||||||
@@ -3,3 +3 @@ target "27.2.3"
|
@@ -3,3 +3,3 @@ target "27.2.3"
|
||||||
ms_build_id "26908389"
|
ms_build_id "26908389"
|
||||||
-runtime "electron"
|
-runtime "electron"
|
||||||
-build_from_source "true"
|
-build_from_source "true"
|
||||||
|
+#runtime "electron"
|
||||||
|
+#build_from_source "true"
|
||||||
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
||||||
deleted file mode 100644
|
index cac528f..0f997ad 100644
|
||||||
index cac528f..0000000
|
|
||||||
--- a/remote/.yarnrc
|
--- a/remote/.yarnrc
|
||||||
+++ /dev/null
|
+++ b/remote/.yarnrc
|
||||||
@@ -1,5 +0,0 @@
|
@@ -3,3 +3,3 @@ target "18.17.1"
|
||||||
-disturl "https://nodejs.org/dist"
|
ms_build_id "255375"
|
||||||
-target "16.20.2"
|
|
||||||
-ms_build_id "255375"
|
|
||||||
-runtime "node"
|
-runtime "node"
|
||||||
-build_from_source "true"
|
-build_from_source "true"
|
||||||
|
+#runtime "node"
|
||||||
|
+#build_from_source "true"
|
||||||
|
23
patches/linux/ppc64le/disable-sysroot.patch
Normal file
23
patches/linux/ppc64le/disable-sysroot.patch
Normal file
@ -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
|
@ -1,19 +1,20 @@
|
|||||||
diff --git a/.yarnrc b/.yarnrc
|
diff --git a/.yarnrc b/.yarnrc
|
||||||
index 6d69893..5568071 100644
|
index 6d69893..849e761 100644
|
||||||
--- a/.yarnrc
|
--- a/.yarnrc
|
||||||
+++ b/.yarnrc
|
+++ b/.yarnrc
|
||||||
@@ -3,3 +3 @@ target "27.2.3"
|
@@ -3,3 +3,3 @@ target "27.2.3"
|
||||||
ms_build_id "26908389"
|
ms_build_id "26908389"
|
||||||
-runtime "electron"
|
-runtime "electron"
|
||||||
-build_from_source "true"
|
-build_from_source "true"
|
||||||
|
+#runtime "electron"
|
||||||
|
+#build_from_source "true"
|
||||||
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
||||||
deleted file mode 100644
|
index cac528f..0f997ad 100644
|
||||||
index cac528f..0000000
|
|
||||||
--- a/remote/.yarnrc
|
--- a/remote/.yarnrc
|
||||||
+++ /dev/null
|
+++ b/remote/.yarnrc
|
||||||
@@ -1,5 +0,0 @@
|
@@ -3,3 +3,3 @@ target "18.17.1"
|
||||||
-disturl "https://nodejs.org/dist"
|
ms_build_id "255375"
|
||||||
-target "16.20.2"
|
|
||||||
-ms_build_id "255375"
|
|
||||||
-runtime "node"
|
-runtime "node"
|
||||||
-build_from_source "true"
|
-build_from_source "true"
|
||||||
|
+#runtime "node"
|
||||||
|
+#build_from_source "true"
|
||||||
|
Loading…
Reference in New Issue
Block a user