mirror of
https://github.com/microsoft/vscode.git
synced 2026-10-06 05:07:29 +01:00
Engineering - Fix macOS CI build to run only ARM64 CLI job (#339046)
This commit is contained in:
1 parent
d547327fc4
commit
64e91bc28b
4 files changed
+1
-20
No files matched your search
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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 },
|
||||
],
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user