فهرست منبع

ci(linux): disable remote from non-server build [skip ci]

Baptiste Augrain 1 سال پیش
والد
کامیت
0f31cbabbd
2فایلهای تغییر یافته به همراه21 افزوده شده و 1 حذف شده
  1. 11 1
      package_linux_bin.sh
  2. 10 0
      patches/linux/client/disable-remote.patch

+ 11 - 1
package_linux_bin.sh

@@ -16,7 +16,17 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
 export VSCODE_SKIP_NODE_VERSION_CHECK=1
 export VSCODE_SYSROOT_PREFIX='-glibc-2.17'
 
-rm -rf remote
+if [[ -d "../patches/${OS_NAME}/client/" ]]; then
+  for file in "../patches/${OS_NAME}/client/"*.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
 
 for i in {1..5}; do # try 5 times
   yarn --cwd build --frozen-lockfile --check-files && break

+ 10 - 0
patches/linux/client/disable-remote.patch

@@ -0,0 +1,10 @@
+diff --git a/build/npm/postinstall.js b/build/npm/postinstall.js
+index 72dd74f..94d4957 100644
+--- a/build/npm/postinstall.js
++++ b/build/npm/postinstall.js
+@@ -86,4 +86,3 @@ for (let dir of dirs) {
+ 
+-	if (/^(.build\/distro\/npm\/)?remote/.test(dir) && process.platform === 'win32' && (process.arch === 'arm64' || process.env['npm_config_arch'] === 'arm64')) {
+-		// windows arm: do not execute `yarn` on remote folder
++	if (/^(.build\/distro\/npm\/)?remote/.test(dir)) {
+ 		continue;