feat(1.82): update patches and use node-v18 (#1626)

VSCodium · Sep 3, 2023 · 61f4931 · 61f4931
1 parent 6f36a98
commit 61f4931
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 75 deletions.
diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: linux
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -231,7 +231,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Check version
         env:

diff --git a/.github/workflows/insider-macos.yml b/.github/workflows/insider-macos.yml
@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: osx
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -48,12 +48,12 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         with:
-          ref: insider
+          ref: ${{ env.GITHUB_BRANCH }}
 
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Clone VSCode repo
         env:

diff --git a/.github/workflows/insider-spearhead.yml b/.github/workflows/insider-spearhead.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml
@@ -26,7 +26,7 @@ on:
 env:
   APP_NAME: VSCodium
   ASSETS_REPOSITORY: ${{ github.repository }}-insiders
-  GITHUB_BRANCH: insider
+  GITHUB_BRANCH: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'insider' }}
   OS_NAME: windows
   VERSIONS_REPOSITORY: ${{ github.repository_owner }}/versions
   VSCODE_QUALITY: insider
@@ -58,7 +58,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.github/workflows/stable-macos.yml b/.github/workflows/stable-macos.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Clone VSCode repo
         run: . get_repo.sh

diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: '18'
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.20
+18.15
diff --git a/get_repo.sh b/get_repo.sh
@@ -112,4 +112,4 @@ fi
 
 export MS_TAG
 export MS_COMMIT
-export RELEASE_VERSION
+export RELEASE_VERSION
diff --git a/insider.json b/insider.json
@@ -1 +1,4 @@
-
+{
+  "tag": "1.82.0",
+  "commit": "f1302be1e67e3af5fbeb8bbb2ea784de7bc96150"
+}
diff --git a/patches/brand.patch b/patches/brand.patch
diff --git a/patches/fix-eol-banner.patch b/patches/fix-eol-banner.patch
@@ -48,21 +48,15 @@ index b120c94..1bb2b88 100644
 +
  	toJSON(): object {
 diff --git a/src/vs/workbench/electron-sandbox/window.ts b/src/vs/workbench/electron-sandbox/window.ts
-index cf6af9d..108ce8f 100644
+index 1efcf6b..b52830c 100644
 --- a/src/vs/workbench/electron-sandbox/window.ts
 +++ b/src/vs/workbench/electron-sandbox/window.ts
-@@ -725,3 +725,4 @@ export class NativeWindow extends Disposable {
- 					actions,
--					icon: Codicon.warning
-+					icon: Codicon.warning,
-+					neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 				});
-@@ -764,3 +765,4 @@ export class NativeWindow extends Disposable {
- 					actions,
--					icon: Codicon.warning
-+					icon: Codicon.warning,
-+					neverShowAgain: { id: 'macoseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
- 				});
+@@ -738,3 +738,4 @@ export class NativeWindow extends Disposable {
+ 				actions,
+-				icon: Codicon.warning
++				icon: Codicon.warning,
++				neverShowAgain: { id: 'windowseol', isSecondary: true, scope: NeverShowAgainScope.APPLICATION }
+ 			});
 diff --git a/src/vs/workbench/services/banner/browser/bannerService.ts b/src/vs/workbench/services/banner/browser/bannerService.ts
 index 639b1b2..70e8847 100644
 --- a/src/vs/workbench/services/banner/browser/bannerService.ts