Fix custom-gallery patch (#758)

* Fix custom-gallery patch * Bump GA to node 14 Co-authored-by: Atesca <[email protected]>
VSCodium · Jul 10, 2021 · d29337f · d29337f
1 parent c7cc061
commit d29337f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v1
         with:
-          node-version: 12.14.1
+          node-version: 14
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v1
         with:
-          node-version: 12.14.1
+          node-version: 14
 
       - name: Check PR or cron
         run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v1
         with:
-          node-version: 12.18.3
+          node-version: 14
 
       - name: Install Yarn
         run: npm install -g yarn

diff --git a/patches/custom-gallery.patch b/patches/custom-gallery.patch
@@ -2,14 +2,14 @@ diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
 index 129b8de..fadb99a 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -62,6 +62,7 @@ export interface IProductConfiguration {
+@@ -68,6 +68,7 @@ export interface IProductConfiguration {
 
- 	readonly extensionsGallery?: {
- 		readonly serviceUrl: string;
-+		readonly cacheUrl?: string;
- 		readonly itemUrl: string;
- 		readonly controlUrl: string;
- 		readonly recommendationsUrl: string;
+        readonly extensionsGallery?: {
+        readonly serviceUrl: string;
++       readonly cacheUrl?: string;
+        readonly itemUrl: string;
+        readonly resourceUrlTemplate: string;
+        readonly controlUrl: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
 index d79c8a3..8b4153f 100644
 --- a/src/vs/platform/product/common/product.ts