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

Merge patch 8.1.240916 into main #508

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Merge patch 8.1.240916 into main #508

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f85fd1
Update build.yml to include 'dev/*' branches in pull_request event
Arlodotexe Sep 12, 2024
cb69436
Update CI to trigger on branch push to 'dev/*'
Arlodotexe Sep 12, 2024
28e6925
Exclude uap in WinUI package, wasdk in UWP package (#500)
Arlodotexe Sep 16, 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
16 changes: 13 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ name: CI
on:
# Triggers the workflow on push or pull request events but only for the main or release branches
push:
branches: [ main, 'rel/*' ]
branches: [ main, 'rel/*', 'dev/*' ]
pull_request:
branches: [ main ]
branches: [ main, 'dev/*' ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down 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
Loading