Skip to content
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

Update .NET 9 runtime for single machine CI job #75889

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Update .NET 9 runtime for single machine CI job #75889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe015c6
Update .NET 9 runtime for single machine CI job
jjonescz Nov 13, 2024
f8a7f8f
Use regular pool
jjonescz Nov 15, 2024
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
13 changes: 12 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ variables:
${{ else }}:
value: windows.vs2022preview.amd64

- name: Vs2022RegularQueueName
${{ if eq(variables['System.TeamProject'], 'public') }}:
value: windows.vs2022.amd64.open
${{ else }}:
value: windows.vs2022.amd64

- name: UbuntuQueueName
${{ if eq(variables['System.TeamProject'], 'public') }}:
value: Build.Ubuntu.2004.Amd64.Open
Expand Down Expand Up @@ -107,6 +113,11 @@ parameters:
default:
name: $(PoolName)
demands: ImageOverride -equals $(Vs2022PreviewQueueName)
- name: vs2022RegularPool
type: object
default:
name: $(PoolName)
demands: ImageOverride -equals $(Vs2022RegularQueueName)

stages:
- stage: Windows_Debug_Build
Expand Down Expand Up @@ -271,7 +282,7 @@ stages:
jobName: Test_Windows_CoreClr_Debug_Single_Machine
testArtifactName: Transport_Artifacts_Windows_Debug
configuration: Debug
poolParameters: ${{ parameters.vs2022PreviewPool }}
poolParameters: ${{ parameters.vs2022RegularPool }}
testArguments: -testCoreClr

- template: eng/pipelines/test-windows-job.yml
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/test-windows-job-single-machine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
displayName: 'Install .NET 9 Runtime'
inputs:
packageType: runtime
version: 9.0.0-preview.3.24172.9
version: 9.0.0-rc.2.24473.5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Man I wish it were more straightforward to flow the sdk version from global.json here. This is obviously prone to fall out of date, but, I'm not sure we can justify the investigation effort at this point either.

Copy link
Contributor

@RikkiGibson RikkiGibson Nov 13, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a useGlobalJson task parameter but surely no use if global.json is not on disk on the test machine.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I might look into this later (perhaps when arcade bumps SDK and I will need to do this again). But for now, the tests are actually failing on some assert, so I'm going to prioritize investigating that.

includePreviewVersions: true
installationPath: '$(Build.SourcesDirectory)/.dotnet'

Expand Down