Merge from vscode merge-base (#22769)

* Merge from vscode merge-base * Turn off basic checks * Enable compilation, unit, and integration tests
2026-02-17 02:51:36 -05:00 · 2023-04-18 18:28:58 -07:00
parent 6186358001
commit 6bd0a17d3c
2389 changed files with 92183 additions and 42601 deletions
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -8,6 +8,10 @@ schedules:
        - main
        - joao/web

+trigger:
+  branches:
+    include: ["main", "release/*"]
+
 parameters:
  - name: VSCODE_DISTRO_REF
    displayName: Distro Ref (Private build)
@@ -104,9 +108,11 @@ variables:
  - name: VSCODE_BUILD_STAGE_WINDOWS
    value: ${{ or(eq(parameters.VSCODE_BUILD_WIN32, true), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}
  - name: VSCODE_BUILD_STAGE_LINUX
-    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true), eq(parameters.VSCODE_BUILD_WEB, true)) }}
+    value: ${{ or(eq(parameters.VSCODE_BUILD_LINUX, true), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE, true), eq(parameters.VSCODE_BUILD_LINUX_ALPINE_ARM64, true)) }}
  - name: VSCODE_BUILD_STAGE_MACOS
    value: ${{ or(eq(parameters.VSCODE_BUILD_MACOS, true), eq(parameters.VSCODE_BUILD_MACOS_ARM64, true)) }}
+  - name: VSCODE_BUILD_STAGE_WEB
+    value: ${{ eq(parameters.VSCODE_BUILD_WEB, true) }}
  - name: VSCODE_CIBUILD
    value: ${{ in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}
  - name: VSCODE_PUBLISH
@@ -162,6 +168,8 @@ stages:
          VSCODE_ARCH: x64
        steps:
          - template: product-compile.yml
+            parameters:
+              VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}

  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:
      - stage: Windows
@@ -169,13 +177,60 @@ stages:
          - Compile
        pool: vscode-1es-windows
        jobs:
-          - ${{ if eq(parameters.VSCODE_BUILD_WIN32, true) }}:
+          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+              - job: WindowsUnitTests
+                displayName: Unit Tests
+                timeoutInMinutes: 60
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: true
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: WindowsIntegrationTests
+                displayName: Integration Tests
+                timeoutInMinutes: 60
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: true
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: WindowsSmokeTests
+                displayName: Smoke Tests
+                timeoutInMinutes: 60
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: true
+
+          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32, true)) }}:
              - job: Windows
                timeoutInMinutes: 120
                variables:
                  VSCODE_ARCH: x64
                steps:
                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}

          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_32BIT, true)) }}:
              - job: Windows32
@@ -184,6 +239,12 @@ stages:
                  VSCODE_ARCH: ia32
                steps:
                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}

          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WIN32_ARM64, true)) }}:
              - job: WindowsARM64
@@ -192,6 +253,12 @@ stages:
                  VSCODE_ARCH: arm64
                steps:
                  - template: win32/product-build-win32.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false

  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX'], true)) }}:
      - stage: LinuxServerDependencies
@@ -206,13 +273,17 @@ stages:
                  NPM_ARCH: x64
                steps:
                  - template: linux/product-build-linux-server.yml
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}

-          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
+          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
              - job: arm64
                variables:
                  VSCODE_ARCH: arm64
                steps:
                  - template: linux/product-build-linux-server.yml
+                    parameters:
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}

  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_LINUX'], true)) }}:
      - stage: Linux
@@ -221,7 +292,54 @@ stages:
          - LinuxServerDependencies
        pool: vscode-1es-linux
        jobs:
-          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
+          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+              - job: Linuxx64UnitTest
+                displayName: Unit Tests
+                container: vscode-bionic-x64
+                variables:
+                  VSCODE_ARCH: x64
+                  NPM_ARCH: x64
+                  DISPLAY: ":10"
+                steps:
+                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: true
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: Linuxx64IntegrationTest
+                displayName: Integration Tests
+                container: vscode-bionic-x64
+                variables:
+                  VSCODE_ARCH: x64
+                  NPM_ARCH: x64
+                  DISPLAY: ":10"
+                steps:
+                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: true
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: Linuxx64SmokeTest
+                displayName: Smoke Tests
+                container: vscode-bionic-x64
+                variables:
+                  VSCODE_ARCH: x64
+                  NPM_ARCH: x64
+                  DISPLAY: ":10"
+                steps:
+                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: true
+
+          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true)) }}:
              - job: Linuxx64
                container: vscode-bionic-x64
                variables:
@@ -230,6 +348,12 @@ stages:
                  DISPLAY: ":10"
                steps:
                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                      VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}

          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX, true), ne(variables['VSCODE_PUBLISH'], 'false')) }}:
              - job: LinuxSnap
@@ -249,6 +373,12 @@ stages:
                  NPM_ARCH: armv7l
                steps:
                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false

          # TODO@joaomoreno: We don't ship ARM snaps for now
          - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARMHF, true)) }}:
@@ -269,6 +399,12 @@ stages:
                  NPM_ARCH: arm64
                steps:
                  - template: linux/product-build-linux-client.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false

          # TODO@joaomoreno: We don't ship ARM snaps for now
          - ${{ if and(false, eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
@@ -296,13 +432,6 @@ stages:
                steps:
                  - template: linux/product-build-alpine.yml

-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_WEB, true)) }}:
-              - job: LinuxWeb
-                variables:
-                  VSCODE_ARCH: x64
-                steps:
-                  - template: web/product-build-web.yml
-
  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}:
      - stage: macOS
        dependsOn:
@@ -312,20 +441,76 @@ stages:
        variables:
          BUILDSECMON_OPT_IN: true
        jobs:
-          - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
-              - job: macOSTest
+          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
+              - job: macOSUnitTest
+                displayName: Unit Tests
                timeoutInMinutes: 90
                variables:
                  VSCODE_ARCH: x64
                steps:
-                  - template: darwin/product-build-darwin-test.yml
-              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
-                  - job: macOS
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: true
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: macOSIntegrationTest
+                displayName: Integration Tests
+                timeoutInMinutes: 90
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: true
+                      VSCODE_RUN_SMOKE_TESTS: false
+              - job: macOSSmokeTest
+                displayName: Smoke Tests
+                timeoutInMinutes: 90
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: true
+
+          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_MACOS, true)) }}:
+              - job: macOS
+                timeoutInMinutes: 90
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: darwin/product-build-darwin.yml
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+
+              - ${{ if eq(parameters.VSCODE_STEP_ON_IT, false) }}:
+                  - job: macOSTest
                    timeoutInMinutes: 90
                    variables:
                      VSCODE_ARCH: x64
                    steps:
                      - template: darwin/product-build-darwin.yml
+                        parameters:
+                          VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                          VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                          VSCODE_RUN_UNIT_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                          VSCODE_RUN_INTEGRATION_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+                          VSCODE_RUN_SMOKE_TESTS: ${{ eq(parameters.VSCODE_STEP_ON_IT, false) }}
+
+              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
                  - job: macOSSign
                    dependsOn:
                      - macOS
@@ -342,7 +527,14 @@ stages:
                  VSCODE_ARCH: arm64
                steps:
                  - template: darwin/product-build-darwin.yml
-              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
+                    parameters:
+                      VSCODE_PUBLISH: ${{ variables.VSCODE_PUBLISH }}
+                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}
+                      VSCODE_RUN_UNIT_TESTS: false
+                      VSCODE_RUN_INTEGRATION_TESTS: false
+                      VSCODE_RUN_SMOKE_TESTS: false
+
+              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
                  - job: macOSARM64Sign
                    dependsOn:
                      - macOSARM64
@@ -362,7 +554,8 @@ stages:
                  VSCODE_ARCH: universal
                steps:
                  - template: darwin/product-build-darwin-universal.yml
-              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
+
+              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
                  - job: macOSUniversalSign
                    dependsOn:
                      - macOSUniversal
@@ -372,6 +565,19 @@ stages:
                    steps:
                      - template: darwin/product-build-darwin-sign.yml

+  - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WEB'], true)) }}:
+      - stage: Web
+        dependsOn:
+          - Compile
+        pool: vscode-1es-linux
+        jobs:
+          - ${{ if eq(parameters.VSCODE_BUILD_WEB, true) }}:
+              - job: Web
+                variables:
+                  VSCODE_ARCH: x64
+                steps:
+                  - template: web/product-build-web.yml
+
  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), ne(variables['VSCODE_PUBLISH'], 'false')) }}:
      - stage: Publish
        dependsOn: