feat: add script to update patches (#1138)

.github/workflows/linux.yml

@@ -116,7 +116,7 @@ jobs:
         run: ./stores/snapcraft/check_version.sh
         env:
           ARCHITECTURE: ${{ matrix.platform }}
-          SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
 
       # - uses: docker/setup-qemu-action@v1
       #   if: env.SHOULD_DEPLOY == 'yes'
@@ -140,9 +140,10 @@ jobs:
         if: env.SHOULD_DEPLOY == 'yes'
 
 
-      - uses: snapcore/action-publish@v1
+      - uses: snapcore/action-publish@master
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         with:
-          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
           snap: ${{ steps.build.outputs.snap }}
           release: stable
         if: env.SHOULD_DEPLOY == 'yes'

build.sh

@@ -23,6 +23,8 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
   if [[ "${OS_NAME}" == "osx" ]]; then
     yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
 
+    find "../VSCode-darwin-${VSCODE_ARCH}" -exec touch {} \;
+
     VSCODE_PLATFORM="darwin"
   elif [[ "${OS_NAME}" == "windows" ]]; then
     . ../build/windows/rtf/make.sh
@@ -58,6 +60,8 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
   else # linux
     yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
+    find "../VSCode-linux-${VSCODE_ARCH}" -exec touch {} \;
+
     if [[ "${SKIP_LINUX_PACKAGES}" != "True" ]]; then
       if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
         yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"

build/update_patches.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+git add .
+git reset -q --hard HEAD
+
+for file in ../patches/*.patch; do
+  if [ -f "${file}" ]; then
+    echo applying patch: "${file}"
+    git apply --ignore-whitespace "${file}"
+    if [ $? -ne 0 ]; then
+      echo failed to apply patch "${file}"
+      git apply --reject "${file}"
+      read -p "Press any key when the conflict have been resolved..." -n1 -s
+      git diff > "${file}"
+    fi
+    git add .
+    git reset -q --hard HEAD
+  fi
+done

docs/build.md

@@ -8,6 +8,11 @@
   - [Windows](#dependencies-windows)
 - [Build Scripts](#build-scripts)
 - [Build in Docker](#build-docker)
+  - [X64](#build-docker-x64)
+  - [ARM 32bits](#build-docker-arm32)
+- [Patch Update Process](#patch-update-process)
+  - [Semi-Automated](#patch-update-process-semiauto)
+  - [Manual](#patch-update-process-manual)
 
 ## <a id="dependencies"></a>Dependencies
 
@@ -54,7 +59,7 @@ Each platform has its build helper script in the directory `build`.
 
 To build for Linux, you can alternatively build VSCodium in docker
 
-### X64
+### <a id="build-docker-x64"></a>X64
 
 Firstly, create the container with:
 ```
@@ -79,7 +84,7 @@ export VSCODE_ARCH=x64
 ./build.sh
 ```
 
-### ARM 32bits
+### <a id="build-docker-arm32"></a>ARM 32bits
 
 Firstly, create the container with:
 ```
@@ -103,3 +108,26 @@ export npm_config_force_process_config="true"
 
 ./build.sh
 ```
+
+## <a id="patch-update-process"></a>Patch Update Process
+
+## <a id="patch-update-process-semiauto"></a>Semi-Automated
+
+- run `./build/build_<os>.sh`, if a patch is failing then,
+- run `./build/update_patches.sh`
+- when the script pause at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
+- fix all the `*.rej` files
+- run `yarn watch`
+- run `./script/code.sh` until everything ok
+- press any key to continue the script `update_patches.sh`
+
+## <a id="patch-update-process-manual"></a>Manual
+
+- run `./build/build_<os>.sh`, if a patch is failing then,
+- open `vscode` directory in **VSCodium**
+- revert all changes
+- run `git apply --reject ../patches/<name>.patch`
+- fix all the `*.rej` files
+- run `yarn watch`
+- run `./script/code.sh` until everything ok
+- run `git diff > ../patches/<name>.patch`

patches/use-github-extensions.patch

@@ -0,0 +1,12 @@
+diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
+--- a/build/gulpfile.extensions.js
++++ b/build/gulpfile.extensions.js
+@@ -223,7 +223,7 @@ const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimr
+ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
+ 	cleanExtensionsBuildTask,
+ 	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
+-	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))),
++	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
+ ));
+ 
+ gulp.task(compileExtensionsBuildTask);

stores/snapcraft/check_version.sh

@@ -15,8 +15,6 @@ else
 
   sudo snap install --channel stable --classic snapcraft
 
-  echo "${SNAP_STORE_LOGIN}" | snapcraft login --with -
-
   echo "Architecture: ${ARCHITECTURE}"
 
   SNAP_VERSION=$(snapcraft list-revisions codium | grep -F "stable*" | grep "${ARCHITECTURE}" | tr -s ' ' | cut -d ' ' -f 4)