ci(linux): try fixing arm32 and ppc64 [skip ci]
This commit is contained in:
parent
5ab85e4972
commit
096bb6e6d7
5 changed files with 71 additions and 19 deletions
|
@ -70,15 +70,6 @@ index 5adfdfb..d6ddead 100644
|
|||
+ Version: `${pkg.version}.${pkg.release}`,
|
||||
+ RawVersion: `${pkg.version.replace(/-\w+$/, '')}.${pkg.release}`,
|
||||
NameVersion: product.win32NameVersion + (target === 'user' ? ' (User)' : ''),
|
||||
diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
|
||||
index c9e57db..aef439c 100644
|
||||
--- a/resources/linux/rpm/code.spec.template
|
||||
+++ b/resources/linux/rpm/code.spec.template
|
||||
@@ -2,3 +2,3 @@ Name: @@NAME@@
|
||||
Version: @@VERSION@@
|
||||
-Release: @@RELEASE@@.el8
|
||||
+Release: el8
|
||||
Summary: Code editing. Redefined.
|
||||
diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
|
||||
index cbd573f..c7bbc90 100644
|
||||
--- a/src/vs/base/common/product.ts
|
||||
|
|
19
patches/linux/armhf/yarn-build.patch
Normal file
19
patches/linux/armhf/yarn-build.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
diff --git a/.yarnrc b/.yarnrc
|
||||
index 6d69893..5568071 100644
|
||||
--- a/.yarnrc
|
||||
+++ b/.yarnrc
|
||||
@@ -3,3 +3 @@ target "27.2.3"
|
||||
ms_build_id "26908389"
|
||||
-runtime "electron"
|
||||
-build_from_source "true"
|
||||
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
||||
deleted file mode 100644
|
||||
index cac528f..0000000
|
||||
--- a/remote/.yarnrc
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-disturl "https://nodejs.org/dist"
|
||||
-target "16.20.2"
|
||||
-ms_build_id "255375"
|
||||
-runtime "node"
|
||||
-build_from_source "true"
|
19
patches/linux/ppc64le/yarn-build.patch
Normal file
19
patches/linux/ppc64le/yarn-build.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
diff --git a/.yarnrc b/.yarnrc
|
||||
index 6d69893..5568071 100644
|
||||
--- a/.yarnrc
|
||||
+++ b/.yarnrc
|
||||
@@ -3,3 +3 @@ target "27.2.3"
|
||||
ms_build_id "26908389"
|
||||
-runtime "electron"
|
||||
-build_from_source "true"
|
||||
diff --git a/remote/.yarnrc b/remote/.yarnrc
|
||||
deleted file mode 100644
|
||||
index cac528f..0000000
|
||||
--- a/remote/.yarnrc
|
||||
+++ /dev/null
|
||||
@@ -1,5 +0,0 @@
|
||||
-disturl "https://nodejs.org/dist"
|
||||
-target "16.20.2"
|
||||
-ms_build_id "255375"
|
||||
-runtime "node"
|
||||
-build_from_source "true"
|
9
patches/linux/rpm.patch
Normal file
9
patches/linux/rpm.patch
Normal file
|
@ -0,0 +1,9 @@
|
|||
diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
|
||||
index c9e57db..ef27166 100644
|
||||
--- a/resources/linux/rpm/code.spec.template
|
||||
+++ b/resources/linux/rpm/code.spec.template
|
||||
@@ -2,3 +2,3 @@ Name: @@NAME@@
|
||||
Version: @@VERSION@@
|
||||
-Release: @@RELEASE@@.el8
|
||||
+Release: el7
|
||||
Summary: Code editing. Redefined.
|
|
@ -54,6 +54,30 @@ for file in ../patches/user/*.patch; do
|
|||
fi
|
||||
done
|
||||
|
||||
if [[ -d "../patches/${OS_NAME}/" ]]; then
|
||||
for file in "../patches/${OS_NAME}/"*.patch; do
|
||||
if [[ -f "${file}" ]]; then
|
||||
echo applying patch: "${file}";
|
||||
if ! git apply --ignore-whitespace "${file}"; then
|
||||
echo failed to apply patch "${file}" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ -d "../patches/${OS_NAME}/${VSCODE_ARCH}/" ]]; then
|
||||
for file in "../patches/${OS_NAME}/${VSCODE_ARCH}/"*.patch; do
|
||||
if [[ -f "${file}" ]]; then
|
||||
echo applying patch: "${file}";
|
||||
if ! git apply --ignore-whitespace "${file}"; then
|
||||
echo failed to apply patch "${file}" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
|
||||
|
@ -65,16 +89,6 @@ if [[ "${OS_NAME}" == "linux" ]]; then
|
|||
if [[ -f "../.nvmrc.linux" ]]; then
|
||||
mv ../.nvmrc.linux ../.nvmrc
|
||||
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}" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ "${OS_NAME}" == "linux" ]]; then
|
||||
|
|
Loading…
Reference in a new issue