Skip to content

Commit d95775d

Browse files
authored
Merge patch 8.1.240916 into main (#508)
* Update build.yml to include 'dev/*' branches in pull_request event * Update CI to trigger on branch push to 'dev/*' * Exclude uap in WinUI package, wasdk in UWP package (#500) * Exclude uwp target under WinUI 3 build and wasdk under WinUI 2 build. * Fixed typo in param name * Checkout repo at ref that triggered workflow run. * Revert "Checkout repo at ref that triggered workflow run." This reverts commit a9cb1b6. * Fix incorrect step name when run under matrix * Update build.yml to include 'dev/*' branches in pull_request event
1 parent 44d3d9d commit d95775d

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,19 @@ jobs:
261261
with:
262262
vs-version: '[17.9,)'
263263

264+
- name: Define excluded MultiTargets (WinUI 2)
265+
if: ${{ matrix.winui == '2' }}
266+
run: |
267+
echo "EXCLUDED_MULTITARGETS=wasdk" >> $env:GITHUB_ENV
268+
269+
- name: Define excluded MultiTargets (WinUI 3)
270+
if: ${{ matrix.winui == '3' }}
271+
run: |
272+
echo "EXCLUDED_MULTITARGETS=uwp" >> $env:GITHUB_ENV
273+
264274
# Build and pack component nupkg
265275
- name: Build and pack component packages
266-
run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release
276+
run: ./tooling/Build-Toolkit-Components.ps1 -MultiTargets all -ExcludeMultiTargets ${{ env.EXCLUDED_MULTITARGETS }} -WinUIMajorVersion ${{ matrix.winui }} -DateForVersion ${{ env.VERSION_DATE }} ${{ env.VERSION_PROPERTY != '' && format('-PreviewVersion "{0}"', env.VERSION_PROPERTY) || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-EnableBinlogs' || '' }} ${{ env.ENABLE_DIAGNOSTICS == 'true' && '-Verbose' || '' }} -BinlogOutput ./ -NupkgOutput ./ -Release
267277

268278
# Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config)
269279
- name: Push Pull Request Packages (if not fork)

0 commit comments

Comments
 (0)