Merge from vscode 709a07d51919d3266ca71699c6ddfb2d3547c0e1 (#6575)

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

@@ -46,6 +46,9 @@ steps:
 - script: |
     DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests"
   displayName: Run Unit Tests
+- script: |
+    DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests"
+  displayName: Run Integration Tests
 - task: PublishTestResults@2
   displayName: Publish Tests Results
   inputs:

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

@@ -93,16 +93,23 @@ steps:
 
 - script: |
     set -e
-    yarn gulp "electron-x64"
-
-    # xvfb seems to be crashing often, let's make sure it's always up
     service xvfb start
+  displayName: Start xvfb
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
+- script: |
+    set -e
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
-    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-x64"
   displayName: Run unit tests
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
+- script: |
+    set -e
+    DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
+    # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-x64"
+  displayName: Run integration tests
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
+
 - script: |
     set -e
     AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \

build/azure-pipelines/product-build.yml

@@ -123,6 +123,7 @@ jobs:
   - LinuxSnap
   - LinuxArmhf
   - LinuxAlpine
+  - LinuxWeb
   - macOS
   steps:
   - template: sync-mooncake.yml
@@ -132,4 +133,4 @@ schedules:
   displayName: Mon-Fri at 7:00
   branches:
     include:
-    - master
+    - master

build/azure-pipelines/web/publish.sh

@@ -7,6 +7,9 @@ ROOT="$REPO/.."
 WEB_BUILD_NAME="vscode-web"
 WEB_TARBALL_FILENAME="vscode-web.tar.gz"
 WEB_TARBALL_PATH="$ROOT/$WEB_TARBALL_FILENAME"
+BUILD="$ROOT/$WEB_BUILD_NAME"
+PACKAGEJSON="$BUILD/package.json"
+VERSION=$(node -p "require(\"$PACKAGEJSON\").version")
 
 rm -rf $ROOT/vscode-web.tar.*
 

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

@@ -99,6 +99,7 @@ steps:
     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-reh-web-win32-$env:VSCODE_ARCH-min-ci" }
+    exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-code-helper" }
     exec { yarn gulp "vscode-win32-$env:VSCODE_ARCH-inno-updater" }
   displayName: Build