diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 882adc5..46646e7 100644 --- 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 index c30762b..4fe74be 100644 --- 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 index bd7ed2d..16e1636 100644 --- 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 index 58b648c..86da86b 100644 --- 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