From b4d10fba8c87f4ca0175a1966cd1777180ea6d6d Mon Sep 17 00:00:00 2001
From: Joao Moreno <jomo@microsoft.com>
Date: Wed, 14 Mar 2018 08:53:12 +0100
Subject: [PATCH] use matrixes

---
 build/tfs/product-build.yml | 101 ++++--------------------------------
 1 file changed, 10 insertions(+), 91 deletions(-)

diff --git a/build/tfs/product-build.yml b/build/tfs/product-build.yml
index 9ca3224ce19..bcb861b35ff 100644
--- a/build/tfs/product-build.yml
+++ b/build/tfs/product-build.yml
@@ -1,5 +1,5 @@
 phases:
-- phase: windows_x64
+- phase: Windows
   queue:
     name: Hosted VS2017
     parallel: 2
@@ -221,10 +221,15 @@ phases:
       node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip
       node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $Exe
 
-- phase: linux_x64
-  queue: Hosted Linux Preview
-  variables:
-    VSCODE_ARCH: x64
+- phase: Linux
+  queue:
+    name: Hosted Linux Preview
+    parallel: 2
+    matrix:
+      x64:
+        VSCODE_ARCH: x64
+      ia32:
+        VSCODE_ARCH: ia32
 
   steps:
   - script: |
@@ -301,92 +306,6 @@ phases:
       MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
       ./build/tfs/linux/release2.sh "$(VSCODE_ARCH)" "$(LINUX_REPO_PASSWORD)"
 
-- phase: linux_ia32
-  queue: Hosted Linux Preview
-  variables:
-    VSCODE_ARCH: ia32
-
-  steps:
-  - script: |
-      # dependencies
-      dpkg --add-architecture i386
-      apt-get update
-      apt-get install -y \
-        gcc-multilib g++-multilib \
-        pkg-config \
-        dbus \
-        xvfb \
-        fakeroot \
-        bc \
-        bsdmainutils \
-        rpm \
-        dpkg-dev:i386 \
-        libgconf-2-4:i386 \
-        libnss3:i386 \
-        libasound2:i386 \
-        libxtst6:i386 \
-        libnotify4:i386 \
-        libx11-dev:i386 \
-        libxkbfile-dev:i386 \
-        libxss1:i386 \
-        libx11-xcb-dev:i386 \
-        libgl1-mesa-glx:i386 libgl1-mesa-dri:i386 \
-        libgirepository-1.0-1:i386 \
-        gir1.2-glib-2.0:i386 \
-        gir1.2-secret-1:i386 \
-        libsecret-1-dev:i386 \
-        libgtk2.0-0:i386 \
-
-      # setup xvfb
-      cp build/tfs/linux/$(VSCODE_ARCH)/xvfb.init /etc/init.d/xvfb
-      chmod +x /etc/init.d/xvfb
-      update-rc.d xvfb defaults
-      service xvfb start
-
-      # setup dbus
-      ln -sf /bin/dbus-daemon /usr/bin/dbus-daemon
-      service dbus start
-
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "8.9.1"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.3.2"
-
-  - script: |
-      export npm_config_arch="$(VSCODE_ARCH)"
-      if [[ "$(VSCODE_ARCH)" == "ia32" ]]; then
-        export PKG_CONFIG_PATH="/usr/lib/i386-linux-gnu/pkgconfig"
-      fi
-
-      echo "machine monacotools.visualstudio.com password $(VSO_PAT)" > ~/.netrc
-      yarn
-      npm run gulp -- hygiene
-      npm run monaco-compile-check
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin
-      node build/tfs/common/installDistro.js
-
-  - script: |
-      VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- vscode-linux-$(VSCODE_ARCH)-min
-    name: build
-
-  - script: |
-      npm run gulp -- "electron-$(VSCODE_ARCH)"
-      DISPLAY=:10 ./scripts/test.sh --build --tfs
-    name: test
-
-  - script: |
-      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb"
-      npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm"
-      #npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-snap"
-
-      AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \
-      AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \
-      MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \
-      ./build/tfs/linux/release2.sh "$(VSCODE_ARCH)" "$(LINUX_REPO_PASSWORD)"
-
 - phase: macOS
   queue: Hosted macOS Preview
   steps:
-- 
GitLab