diff --git a/build/azure-pipelines/product-build-ado-ci.yml b/build/azure-pipelines/product-build-ado-ci.yml index 575b534cb527..5ab1b394449c 100644 --- a/build/azure-pipelines/product-build-ado-ci.yml +++ b/build/azure-pipelines/product-build-ado-ci.yml @@ -456,12 +456,6 @@ extends: variables: BUILDSECMON_OPT_IN: true jobs: - - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: - - template: build/azure-pipelines/darwin/product-build-darwin-cli.yml@self - parameters: - VSCODE_ARCH: x64 - VSCODE_CHECK_ONLY: true - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: - template: build/azure-pipelines/darwin/product-build-darwin-cli.yml@self parameters: diff --git a/build/azure-pipelines/product-build-template.yml b/build/azure-pipelines/product-build-template.yml index e403caa496c1..c088fdcbb1ac 100644 --- a/build/azure-pipelines/product-build-template.yml +++ b/build/azure-pipelines/product-build-template.yml @@ -420,12 +420,6 @@ stages: variables: BUILDSECMON_OPT_IN: true jobs: - - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: - - template: darwin/product-build-darwin-cli.yml@self - parameters: - VSCODE_ARCH: x64 - VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }} - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: - template: darwin/product-build-darwin-cli.yml@self parameters: diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 9153e3042987..1999b8b2c9dd 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -671,12 +671,6 @@ extends: variables: BUILDSECMON_OPT_IN: true jobs: - - ${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}: - - template: build/azure-pipelines/darwin/product-build-darwin-cli.yml@self - parameters: - VSCODE_ARCH: x64 - VSCODE_CHECK_ONLY: ${{ variables.VSCODE_CIBUILD }} - VSCODE_QUALITY: ${{ variables.VSCODE_QUALITY }} - ${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}: - template: build/azure-pipelines/darwin/product-build-darwin-cli.yml@self parameters: diff --git a/build/lib/test/testCheckpointTemplates.test.ts b/build/lib/test/testCheckpointTemplates.test.ts index c33fd45433fc..98658ec1b5ea 100644 --- a/build/lib/test/testCheckpointTemplates.test.ts +++ b/build/lib/test/testCheckpointTemplates.test.ts @@ -531,7 +531,7 @@ suite('Product test checkpoint templates', () => { }))); }); - test('macOS CI includes a CLI job for each selected architecture', () => { + test('macOS CI includes only the ARM64 CLI job', () => { const pipelineFiles = ['product-build.yml', 'product-build-ado-ci.yml', 'product-build-template.yml']; const observed = pipelineFiles.map(file => { const stage = records(readTemplate(file)).find(record => record.stage === 'macOS'); @@ -555,7 +555,6 @@ suite('Product test checkpoint templates', () => { return { file, cliJobs: [ - { when: '${{ if eq(parameters.VSCODE_BUILD_MACOS, true) }}', arch: 'x64', checkOnly }, { when: '${{ if eq(parameters.VSCODE_BUILD_MACOS_ARM64, true) }}', arch: 'arm64', checkOnly }, ], };