Revert "Merge from vscode merge-base (#22769)" (#22779)

This reverts commit 6bd0a17d3c.
2026-04-05 03:20:29 -04:00 · 2023-04-18 21:44:05 -07:00
parent 6bd0a17d3c
commit 47a1745180
2389 changed files with 42588 additions and 92170 deletions
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -8,10 +8,6 @@ schedules:
        - main
        - joao/web

-trigger:
-  branches:
-    include: ["main", "release/*"]
-
 parameters:
  - name: VSCODE_DISTRO_REF
    displayName: Distro Ref (Private build)
@@ -108,11 +104,9 @@ 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)) }}
+    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)) }}
  - 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
@@ -168,8 +162,6 @@ 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
@@ -177,60 +169,13 @@ stages:
          - Compile
        pool: vscode-1es-windows
        jobs:
-          - ${{ 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)) }}:
+          - ${{ if 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
@@ -239,12 +184,6 @@ 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
@@ -253,12 +192,6 @@ 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
@@ -273,17 +206,13 @@ stages:
                  NPM_ARCH: x64
                steps:
                  - template: linux/product-build-linux-server.yml
-                    parameters:
-                      VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }}

-          - ${{ if and(eq(variables['VSCODE_CIBUILD'], false), eq(parameters.VSCODE_BUILD_LINUX_ARM64, true)) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, 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
@@ -292,54 +221,7 @@ stages:
          - LinuxServerDependencies
        pool: vscode-1es-linux
        jobs:
-          - ${{ 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)) }}:
+          - ${{ if eq(parameters.VSCODE_BUILD_LINUX, true) }}:
              - job: Linuxx64
                container: vscode-bionic-x64
                variables:
@@ -348,12 +230,6 @@ 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
@@ -373,12 +249,6 @@ 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)) }}:
@@ -399,12 +269,6 @@ 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)) }}:
@@ -432,6 +296,13 @@ 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:
@@ -441,76 +312,20 @@ stages:
        variables:
          BUILDSECMON_OPT_IN: true
        jobs:
-          - ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
-              - job: macOSUnitTest
-                displayName: Unit Tests
+          - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}:
+              - 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: 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
+                  - template: darwin/product-build-darwin-test.yml
+              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
+                  - 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: ${{ 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
@@ -527,14 +342,7 @@ stages:
                  VSCODE_ARCH: arm64
                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(variables['VSCODE_PUBLISH'], true) }}:
+              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
                  - job: macOSARM64Sign
                    dependsOn:
                      - macOSARM64
@@ -554,8 +362,7 @@ stages:
                  VSCODE_ARCH: universal
                steps:
                  - template: darwin/product-build-darwin-universal.yml
-
-              - ${{ if eq(variables['VSCODE_PUBLISH'], true) }}:
+              - ${{ if eq(variables['VSCODE_CIBUILD'], false) }}:
                  - job: macOSUniversalSign
                    dependsOn:
                      - macOSUniversal
@@ -565,19 +372,6 @@ 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: