Merge branch 'master' into electron-6.0.x

microsoft · Jul 3, 2019 · a9c19a6 · a9c19a6
2 parents 180aadc + 8e47e98
commit a9c19a6
Show file tree

Hide file tree

Showing 97 changed files with 1,377 additions and 1,269 deletions.
diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -40,10 +40,24 @@ steps:
     git merge $(node -p "require('./package.json').distro")
   displayName: Merge distro
 
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+
 - script: |
     set -e
     yarn --frozen-lockfile
   displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+  inputs:
+    keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - script: |
     set -e
@@ -81,14 +95,16 @@ steps:
 
 - script: |
     set -e
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp vscode-darwin-min
+      yarn gulp vscode-darwin-ci
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp vscode-reh-darwin-min
+      yarn gulp vscode-reh-darwin-ci
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    yarn gulp vscode-web-darwin-min
+      yarn gulp vscode-web-darwin-ci
     AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-    yarn gulp upload-vscode-sourcemaps
+      yarn gulp upload-vscode-sourcemaps
   displayName: Build
 
 - script: |

diff --git a/build/azure-pipelines/linux/product-build-linux-alpine.yml b/build/azure-pipelines/linux/product-build-linux-alpine.yml
@@ -68,6 +68,8 @@ steps:
 
 - script: |
     set -e
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
     ./build/azure-pipelines/linux/build-alpine.sh
   displayName: Build
 

diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-arm.yml
@@ -68,6 +68,8 @@ steps:
 
 - script: |
     set -e
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
     ./build/azure-pipelines/linux/build-arm.sh
   displayName: Build
 

diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
@@ -41,10 +41,24 @@ steps:
     git merge $(node -p "require('./package.json').distro")
   displayName: Merge distro
 
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+
 - script: |
     set -e
-    CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+    yarn --frozen-lockfile
   displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+  inputs:
+    keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - script: |
     set -e
@@ -82,17 +96,14 @@ steps:
 
 - script: |
     set -e
-    if [[ "$VSCODE_ARCH" == "ia32" ]]; then
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-linux-$VSCODE_ARCH-min
-    else
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-linux-$VSCODE_ARCH-min
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-reh-linux-$VSCODE_ARCH-min
-      VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-      yarn gulp vscode-web-linux-$VSCODE_ARCH-min
-    fi
+    yarn gulp compile-build
+    yarn gulp compile-extensions-build
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-linux-$VSCODE_ARCH-min-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-reh-linux-$VSCODE_ARCH-min-ci
+    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
+      yarn gulp vscode-web-linux-$VSCODE_ARCH-min-ci
   displayName: Build
 
 - script: |

diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
@@ -14,7 +14,7 @@ jobs:
 #   - template: compile.yml
 
 - job: Windows
-  condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
   timeoutInMinutes: 120
   pool:
     vmImage: VS2017-Win2016
@@ -24,7 +24,7 @@ jobs:
   - template: win32/product-build-win32.yml
 
 - job: Windows32
-  condition: eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_32BIT'], 'true'))
   timeoutInMinutes: 120
   pool:
     vmImage: VS2017-Win2016
@@ -34,7 +34,7 @@ jobs:
   - template: win32/product-build-win32.yml
 
 - job: Linux
-  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   timeoutInMinutes: 120
   pool:
     vmImage: 'Ubuntu-16.04'
@@ -45,7 +45,7 @@ jobs:
   - template: linux/product-build-linux.yml
 
 - job: LinuxSnap
-  condition: eq(variables['VSCODE_BUILD_LINUX'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
   timeoutInMinutes: 120
   pool:
     vmImage: 'Ubuntu-16.04'
@@ -57,7 +57,7 @@ jobs:
   - template: linux/snap-build-linux.yml
 
 - job: LinuxArmhf
-  condition: and(eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
   timeoutInMinutes: 120
   pool:
     vmImage: 'Ubuntu-16.04'
@@ -67,7 +67,7 @@ jobs:
   - template: linux/product-build-linux-arm.yml
 
 - job: LinuxAlpine
-  condition: and(eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ALPINE'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable'))
   timeoutInMinutes: 120
   pool:
     vmImage: 'Ubuntu-16.04'
@@ -77,7 +77,7 @@ jobs:
   - template: linux/product-build-linux-alpine.yml
 
 - job: macOS
-  condition: eq(variables['VSCODE_BUILD_MACOS'], 'true')
+  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
   timeoutInMinutes: 120
   pool:
     vmImage: macOS 10.13
@@ -114,9 +114,9 @@ jobs:
   steps:
   - template: sync-mooncake.yml
 
-schedules:
-- cron: "0 8 * * Mon-Fri"
-  displayName: Mon-Fri at 8:00
-  branches:
-    include:
-    - electron-6.0.x
+# schedules:
+# - cron: "0 6 * * Mon-Fri"
+#   displayName: Mon-Fri at 6:00
+#   branches:
+#     include:
+#     - master
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
@@ -41,13 +41,27 @@ steps:
     exec { git merge $(node -p "require('./package.json').distro") }
   displayName: Merge distro
 
+- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+  inputs:
+    keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:npm_config_arch="$(VSCODE_ARCH)"
     $env:CHILD_CONCURRENCY="1"
     exec { yarn --frozen-lockfile }
   displayName: Install dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+  inputs:
+    keyfile: '**/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+    targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+    vstsFeed: 'npm-vscode'
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -91,9 +105,11 @@ steps:
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min" }
-    exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min" }
-    exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min" }
+    exec { yarn gulp compile-build }
+    exec { yarn gulp compile-extensions-build }
+    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min-ci" }
+    exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min-ci" }
+    exec { yarn gulp "vscode-web-win32-$env:VSCODE_ARCH-min-ci" }
     exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
   displayName: Build
 

diff --git a/build/download/download.js b/build/download/download.js