diff options
| author | 5an7y-Microsoft <[email protected]> | 2026-03-31 16:14:04 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-03-31 16:14:04 -0700 |
| commit | 7652eb722d8e128d15b079d5c9ce5f1dee5be11d (patch) | |
| tree | 9fb1e8d29a256c3ed6207bcd0f96fbb402c540b0 /.github | |
| parent | f83e1a1827bb2966de1449bf6784866d9609923f (diff) | |
| parent | 21d02d7a54d5fcddcebc38fa1284523f03b6ac48 (diff) | |
Merge pull request #1365 from microsoft/develop
RI Develop to Main
Diffstat (limited to '.github')
| -rw-r--r-- | .github/scripts/Build-ChangedSamples.ps1 | 7 | ||||
| -rw-r--r-- | .github/workflows/Code-Scanning.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ci.yml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/scripts/Build-ChangedSamples.ps1 b/.github/scripts/Build-ChangedSamples.ps1 index bdaee943..3e91eb88 100644 --- a/.github/scripts/Build-ChangedSamples.ps1 +++ b/.github/scripts/Build-ChangedSamples.ps1 @@ -22,7 +22,7 @@ foreach ($file in $ChangedFiles) { $filename = Split-Path $file -Leaf # Files that can affect how every sample is built should trigger a full build - if ($filename -eq "Build-AllSamples.ps1" -or $filename -eq "Build-Sample.ps1" -or $filename -eq "Build-SampleSet.ps1" -or $filename -eq "exclusions.csv" -or $filename -eq "Directory.Build.props" -or $filename -eq "packages.config") { + if ($filename -eq "Build-Samples.ps1" -or $filename -eq "exclusions.csv" -or $filename -eq "Directory.Build.props" -or $filename -eq "packages.config") { $buildAll = $true } if ($dir -like "$root\.github\scripts" -or $dir -like "$root\.github\scripts\*") { @@ -52,9 +52,10 @@ foreach ($file in $ChangedFiles) { } if ($buildAll) { - .\Build-AllSamples -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs") + .\Build-Samples -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs") } else { - .\Build-SampleSet -SampleSet $sampleSet -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs") + $sampleNames = $sampleSet.Keys | Sort-Object + .\Build-Samples -Samples $sampleNames -Verbose:$Verbose -LogFilesDirectory (Join-Path $root "_logs") } diff --git a/.github/workflows/Code-Scanning.yml b/.github/workflows/Code-Scanning.yml index 1364bfbd..c7637e3b 100644 --- a/.github/workflows/Code-Scanning.yml +++ b/.github/workflows/Code-Scanning.yml @@ -66,7 +66,7 @@ jobs: WDS_Platform: x64 WDS_WipeOutputs: ${{ true }} - if: github.event_name == 'push' - run: .\Build-AllSamples.ps1 -Verbose -ThrottleLimit 1 + run: .\Build-Samples.ps1 -Verbose -ThrottleLimit 1 env: WDS_Configuration: Debug WDS_Platform: x64 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f3d7693..0e847b35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: run: nuget restore .\packages.config -PackagesDirectory .\packages\ - name: Retrieve and build all available solutions - run: .\Build-AllSamples.ps1 -Verbose + run: .\Build-Samples.ps1 -Verbose env: WDS_Configuration: ${{ matrix.configuration }} WDS_Platform: ${{ matrix.platform }} |