Browse Source

fix(linux): build packages

Baptiste Augrain 2 months ago
parent
commit
6944a05db8
2 changed files with 2 additions and 16 deletions
  1. 0 16
      patches/linux/fix-build.patch
  2. 2 0
      prepare_assets.sh

+ 0 - 16
patches/linux/fix-build.patch

@@ -1,19 +1,3 @@
-diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
-index cd8610d..0d94563 100644
---- a/build/gulpfile.vscode.linux.js
-+++ b/build/gulpfile.vscode.linux.js
-@@ -309,4 +309,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
--	gulp.task(prepareDebTask);
--	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, buildDebPackage(arch));
-+	const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
- 	gulp.task(buildDebTask);
-@@ -315,4 +314,3 @@ BUILD_TARGETS.forEach(({ arch }) => {
- 	const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
--	gulp.task(prepareRpmTask);
--	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, buildRpmPackage(arch));
-+	const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
- 	gulp.task(buildRpmTask);
 diff --git a/build/linux/dependencies-generator.js b/build/linux/dependencies-generator.js
 index 448ab38..ffc71f9 100644
 --- a/build/linux/dependencies-generator.js

+ 2 - 0
prepare_assets.sh

@@ -152,10 +152,12 @@ else
   fi
 
   if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
+    yarn gulp "vscode-linux-${VSCODE_ARCH}-prepare-deb"
     yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
   fi
 
   if [[ "${SHOULD_BUILD_RPM}" != "no" ]]; then
+    yarn gulp "vscode-linux-${VSCODE_ARCH}-prepare-rpm"
     yarn gulp "vscode-linux-${VSCODE_ARCH}-build-rpm"
   fi