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

Jump to bottom

Disable static restore in more locations #66567

Merged
merged 4 commits into from
Jan 30, 2023
Merged

Disable static restore in more locations #66567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9873ef6
Disable static restore in more locations
dibarbet Jan 27, 2023
167c656
Run compilers CI when build scripts change
dibarbet Jan 27, 2023
3fb6b5c
Include compiler generators in compilers code change check
dibarbet Jan 27, 2023
063679e
Remove separate restore in bootstrap build
dibarbet Jan 28, 2023
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
8 changes: 2 additions & 6 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ stages:
include:
- src/Compilers/*
- src/Dependencies/*
- eng/*
Copy link
Member Author

Choose a reason for hiding this comment

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

seems like we should run compiler CI when build scripts change

Copy link
Member

Choose a reason for hiding this comment

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

Since you are touching this, could you also fix #65602 in this PR?

Copy link
Member Author

Choose a reason for hiding this comment

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

Added the compiler generator tools path - let me know if there were other directories you were thinking of

- src/Tools/Source/CompilerGeneratorTools/*

- job: Correctness_Build_Artifacts
dependsOn: Determine_Changes
Expand Down Expand Up @@ -322,12 +324,6 @@ stages:
steps:
- template: eng/pipelines/checkout-windows-task.yml

- task: PowerShell@2
displayName: Restore
inputs:
filePath: eng/build.ps1
arguments: -configuration Debug -prepareMachine -ci -restore -binaryLogName Restore.binlog

- powershell: .\eng\test-rebuild.ps1 -ci -configuration Release
displayName: Run BuildValidator

Expand Down
4 changes: 4 additions & 0 deletions eng/build-utils.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,10 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string]

if ($ci) {
$args += " /p:ContinuousIntegrationBuild=true"
# Temporarily disable RestoreUseStaticGraphEvaluation to work around this NuGet issue
# in our CI builds
# https://github.com/NuGet/Home/issues/12373
$args += " /p:RestoreUseStaticGraphEvaluation=false"
}

if ($bootstrapDir -ne "") {
Expand Down
7 changes: 6 additions & 1 deletion eng/test-determinism.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ function Run-Build([string]$rootDir, [string]$logFileName) {

Stop-Processes

# Temporarily disable RestoreUseStaticGraphEvaluation to work around this NuGet issue
# in our CI builds
# https://github.com/NuGet/Home/issues/12373
$restoreUseStaticGraphEvaluation = if ($ci) { $false } else { $true }

Write-Host "Building $solution using $bootstrapDir"
MSBuild $toolsetBuildProj `
/p:Projects=$solution `
Expand All @@ -65,7 +70,7 @@ function Run-Build([string]$rootDir, [string]$logFileName) {
/p:BootstrapBuildPath=$bootstrapDir `
/p:RunAnalyzers=false `
/p:RunAnalyzersDuringBuild=false `
/p:RestoreUseStaticGraphEvaluation=true `
/p:RestoreUseStaticGraphEvaluation=$restoreUseStaticGraphEvaluation `
/bl:$logFilePath

Stop-Processes
Expand Down
2 changes: 1 addition & 1 deletion eng/test-rebuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ try {

if (-not $noBuild) {
Write-Host "Building Roslyn"
Exec-Block { & (Join-Path $PSScriptRoot "build.ps1") -build -bootstrap -ci:$ci -useGlobalNuGetCache:$useGlobalNuGetCache -configuration:$configuration -pack -binaryLog }
Exec-Block { & (Join-Path $PSScriptRoot "build.ps1") -restore -build -bootstrap -ci:$ci -useGlobalNuGetCache:$useGlobalNuGetCache -configuration:$configuration -pack -binaryLog }
}

Subst-TempDir
Expand Down