Skip to content

Commit d7af4b7

Browse files
authored
Use macOS 11 to get things green (#2083)
1 parent 9a5e400 commit d7af4b7

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

scripts/azure-pipelines-complete.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,12 @@ parameters:
2525
pool:
2626
name: Azure Pipelines
2727
vmImage: windows-2022
28-
- name: VM_IMAGE_MAC_NATIVE
29-
type: object
30-
default:
31-
pool:
32-
name: Azure Pipelines
33-
vmImage: macos-11
3428
- name: VM_IMAGE_MAC
3529
type: object
3630
default:
3731
pool:
3832
name: Azure Pipelines
39-
vmImage: macos-12
33+
vmImage: macos-11
4034
- name: VM_IMAGE_LINUX
4135
type: object
4236
default:
@@ -60,6 +54,6 @@ stages:
6054
VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
6155
VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }}
6256
VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
63-
VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC_NATIVE }}
57+
VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC }}
6458
VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }}
6559
VM_IMAGE_LINUX_NATIVE: ${{ parameters.VM_IMAGE_LINUX }}

scripts/azure-templates-stages.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -774,9 +774,10 @@ stages:
774774
steps:
775775
- checkout: self
776776
- template: azure-templates-variables.yml
777-
- template: azure-templates-github-status.yml
778-
parameters:
779-
state: 'pending'
777+
- ${{ if ne(parameters.buildPipelineType, 'both') }}:
778+
- template: azure-templates-github-status.yml
779+
parameters:
780+
state: 'pending'
780781
- task: DownloadBuildArtifacts@0
781782
displayName: Download the coverage_netcore_windows artifact
782783
inputs:
@@ -797,7 +798,8 @@ stages:
797798
inputs:
798799
codeCoverageTool: Cobertura
799800
summaryFileLocation: 'output/**/Cobertura.xml'
800-
- template: azure-templates-github-status.yml
801+
- ${{ if ne(parameters.buildPipelineType, 'both') }}:
802+
- template: azure-templates-github-status.yml
801803

802804
- ${{ if ne(parameters.buildPipelineType, 'build') }}:
803805
- stage: samples

0 commit comments

Comments
 (0)