Skip to content

new os image for official builds. #6467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 23, 2022
Merged

new os image for official builds. #6467

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33c5893
new os image
michaelgsharp Nov 23, 2022
14e8523
macos fix
michaelgsharp Nov 23, 2022
1678643
macos fix
michaelgsharp Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build/vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ variables:
DOTNET_MULTILEVEL_LOOKUP: 0
Codeql.Enabled: true
Codeql.SkipTaskAutoInjection: True #default to not inject CodeQL tasks, we'll enable it in a single job.

stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -100,7 +100,7 @@ stages:
pool:
vmImage: macOS-12
steps:
- script: brew update && brew unlink [email protected] && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
- script: brew update && brew unlink [email protected] && rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
displayName: Install build dependencies
# Only build native assets to avoid conflicts.
- script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:CopyPackageAssets=true
Expand Down Expand Up @@ -148,7 +148,7 @@ stages:
_TeamName: DotNetCore
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
demands: ImageOverride -equals windows.vs2019.amd64
steps:
# Only build native assets to avoid conflicts.
- script: ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:CopyPackageAssets=true
Expand All @@ -175,7 +175,7 @@ stages:
_TeamName: DotNetCore
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
demands: ImageOverride -equals windows.vs2019.amd64
steps:

# Build both native and managed assets.
Expand Down Expand Up @@ -227,15 +227,15 @@ stages:
- NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
- _SignType: real
- _TeamName: DotNetCore
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType)
- _InternalBuildArgs: /p:DotNetSignType=$(_SignType)
/p:TeamName=$(_TeamName)
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
/p:OfficialBuildId=$(OfficialBuildId)
/p:DotNetPublishUsingPipelines=$true
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
demands: ImageOverride -equals windows.vs2019.amd64
steps:

# Download all agent packages from all previous phases
Expand Down