Skip to content

Commit 5b4981a

Browse files
Update To MacOS 13 (dotnet#7285)
* mac 13 testing * build fixes
1 parent 5c50319 commit 5b4981a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.vsts-dotnet-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ jobs:
123123
buildScript: ./build.sh
124124
innerLoop: true
125125
pool:
126-
vmImage: macOS-12
127-
helixQueue: OSX.1200.Amd64.Open
126+
vmImage: macOS-13
127+
helixQueue: OSX.13.Amd64.Open
128128

129129
- template: /build/ci/job-template.yml
130130
parameters:
@@ -144,8 +144,8 @@ jobs:
144144
_targetFramework: net6.0
145145
innerLoop: true
146146
pool:
147-
vmImage: macOS-12
148-
helixQueue: OSX.1200.Arm64.Open
147+
vmImage: macOS-13
148+
helixQueue: OSX.13.Arm64.Open
149149

150150
- template: /build/ci/job-template.yml
151151
parameters:

build/.night-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
buildScript: ./build.sh
6464
nightlyBuild: true
6565
pool:
66-
vmImage: macOS-12
66+
vmImage: macOS-13
6767

6868
- template: /build/ci/job-template.yml
6969
parameters:

build/ci/job-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
# Extra MacOS step required to install OS-specific dependencies
6969
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}:
70-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
70+
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
7171
displayName: Install MacOS build dependencies
7272
# Extra Apple MacOS step required to install OS-specific dependencies
7373
- ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}:

build/vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
- name: WindowsImage
3131
value: 1es-windows-2019
3232
- name: MacImage
33-
value: macOS-12
33+
value: macOS-13
3434
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
3535
- name: enableSourceIndex
3636
value: true
@@ -142,7 +142,7 @@ extends:
142142
PathtoPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
143143
ArtifactName: pkgassets
144144
steps:
145-
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
145+
- script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 && rm '/usr/local/bin/2to3-3.11' && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
146146
displayName: Install build dependencies
147147
# Only build native assets to avoid conflicts.
148148
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true

0 commit comments

Comments
 (0)