Merge branch 'joao/build-perf'

build/azure-pipelines/compile.yml

@@ -0,0 +1,78 @@
+steps:
+- task: AzureKeyVault@1
+  displayName: 'Azure Key Vault: Get Secrets'
+  inputs:
+    azureSubscription: 'vscode-builds-subscription'
+    KeyVaultName: vscode
+
+- task: NodeTool@0
+  inputs:
+    versionSpec: "10.15.1"
+
+- script: |
+    set -e
+    cat << EOF > ~/.netrc
+    machine monacotools.visualstudio.com
+    password $(devops-pat)
+    machine github.com
+    login vscode
+    password $(github-distro-mixin-password)
+    EOF
+    git config user.email "vscode@microsoft.com"
+    git config user.name "VSCode"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
+    git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
+    git fetch distro
+    git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
+
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+
+- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
+  inputs:
+    versionSpec: "1.10.1"
+
+- script: 'yarn --frozen-lockfile'
+  displayName: Install Dependencies
+  condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
+#   inputs:
+#     keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
+#     targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
+#     vstsFeed: '$(ArtifactFeed)'
+#   condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
+
+- script: 'yarn gulp mixin'
+  displayName: Mix in quality
+
+- script: 'yarn gulp hygiene'
+  displayName: Run hygiene checks
+
+- script: 'yarn monaco-compile-check'
+  displayName: Run Monaco compilation checks
+
+- script: |
+    set -e
+    cd $BUILD_STAGINGDIRECTORY
+    git clone https://github.com/microsoft/vscode-telemetry-extractor.git
+    cd vscode-telemetry-extractor
+    git checkout 3b04aba5bfdfcca1a5426cd2c51a90d18740d0bc
+    npm i
+    npm run setup-extension-repos
+    node ./out/cli-extract.js --sourceDir $BUILD_SOURCESDIRECTORY --excludedDirPattern extensions  --outputDir . --applyEndpoints --includeIsMeasurement --patchWebsiteEvents
+    node ./out/cli-extract-extensions.js --sourceDir ./src/telemetry-sources --outputDir . --applyEndpoints --includeIsMeasurement
+    mkdir -p $BUILD_SOURCESDIRECTORY/.build/telemetry
+    mv declarations-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-core.json
+    mv declarations-extensions-resolved.json $BUILD_SOURCESDIRECTORY/.build/telemetry/telemetry-extensions.json
+  displayName: Extract Telemetry
+
+- script: 'VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" ./build/azure-pipelines/linux/build.sh'
+  displayName: Build

build/azure-pipelines/darwin/build.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-yarn gulp vscode-darwin-min
-yarn gulp vscode-reh-darwin-min
-yarn gulp upload-vscode-sourcemaps

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -78,7 +78,10 @@ steps:
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
     AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \
-    ./build/azure-pipelines/darwin/build.sh
+    yarn gulp vscode-darwin-min
+    yarn gulp vscode-reh-darwin-min
+    yarn gulp vscode-web-darwin-min
+    yarn gulp upload-vscode-sourcemaps
   displayName: Build
 
 - script: |

build/azure-pipelines/linux/build.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-yarn gulp "vscode-linux-$VSCODE_ARCH-min"
-
-if [[ "$VSCODE_ARCH" != "ia32" ]]; then
-	yarn gulp vscode-reh-linux-$VSCODE_ARCH-min
-fi

build/azure-pipelines/linux/product-build-linux.yml

@@ -77,8 +77,15 @@ steps:
 
 - script: |
     set -e
-    VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
-    ./build/azure-pipelines/linux/build.sh
+    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
+        yarn gulp vscode-reh-linux-$VSCODE_ARCH-min
+        yarn gulp vscode-web-linux-$VSCODE_ARCH-min
+    fi
   displayName: Build
 
 - script: |

build/azure-pipelines/product-build.yml

@@ -7,6 +7,12 @@ resources:
     image: snapcore/snapcraft:stable
 
 jobs:
+# - job: Linux
+#   pool:
+#     vmImage: 'Ubuntu-16.04'
+#   steps:
+#   - template: compile.yml
+
 - job: Windows
   condition: eq(variables['VSCODE_BUILD_WIN32'], 'true')
   timeoutInMinutes: 120

build/azure-pipelines/win32/build.ps1

@@ -1,5 +0,0 @@
-. build/azure-pipelines/win32/exec.ps1
-$ErrorActionPreference = "Stop"
-exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-min" }
-exec { yarn gulp "vscode-reh-win32-$env:VSCODE_ARCH-min" }
-exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }

build/azure-pipelines/win32/product-build-win32.yml

@@ -85,7 +85,10 @@ steps:
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
     $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)"
-    .\build\azure-pipelines\win32\build.ps1
+    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 "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
   displayName: Build
 
 - powershell: |

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.37.0",
-  "distro": "409a5566f22a67f075b188de068d6a5a24dbe18d",
+  "distro": "b21cb2a950fdcc3ab100ee0d36d42f433de3a79a",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -155,4 +155,4 @@
     "windows-mutex": "0.2.1",
     "windows-process-tree": "0.2.3"
   }
-}
+}