Skip to content

Commit

Permalink
Merge patch 8.1.240916 into main (#508)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Arlodotexe authored Sep 16, 2024
1 parent 44d3d9d commit d95775d
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,19 @@ jobs:
with:
vs-version: '[17.9,)'

- name: Define excluded MultiTargets (WinUI 2)
if: ${{ matrix.winui == '2' }}
run: |
echo "EXCLUDED_MULTITARGETS=wasdk" >> $env:GITHUB_ENV
- name: Define excluded MultiTargets (WinUI 3)
if: ${{ matrix.winui == '3' }}
run: |
echo "EXCLUDED_MULTITARGETS=uwp" >> $env:GITHUB_ENV
# Build and pack component nupkg
- name: Build and pack component packages
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
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

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

0 comments on commit d95775d

Please sign in to comment.