Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI

on:
push:
branches: [main]
branches: [main, beta]
pull_request:
branches: [main]
branches: [main, beta]
workflow_dispatch:

jobs:
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/conventional-commits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,26 @@ permissions:
pull-requests: write

jobs:
pull-request-target:
name: Enforce beta promotion path
runs-on: ubuntu-latest
steps:
- name: Validate pull request target
env:
BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
HEAD_BRANCH: ${{ github.event.pull_request.head.ref }}
run: |
if [ "$BASE_BRANCH" = "beta" ]; then
exit 0
fi

if [ "$BASE_BRANCH" = "main" ] && [ "$HEAD_BRANCH" = "beta" ]; then
exit 0
fi

echo "Pull requests must target beta. Only the beta branch may be merged into main."
exit 1

commit-messages:
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ GitHub Actions workflows live in [.github/workflows](.github/workflows):
vulnerable NuGet packages (`dotnet list package --vulnerable`), generates a CycloneDX SBOM, and scans it
with Grype (fails on high/critical vulnerabilities; results are also uploaded to the repo's Code Scanning
tab).
- **`ci.yml`** — runs the above on every push/PR to `main`.
- **`ci.yml`** — runs the above on every push/PR to `main` or `beta`.
- **`release.yml`** — runs only when manually dispatched from `main` or `beta`, uses Conventional Commits
to determine the next version, then publishes a self-contained `win-x64` build with its SBOM attached to
the generated GitHub Release. Runs dispatched from `beta` create prereleases.
- **`conventional-commits.yml`** — lints every commit message and the PR title against Conventional
Commits on every pull request; see [Commit message format](#commit-message-format) below.
Commits on every pull request and enforces feature PRs into `beta` with only `beta` allowed to target
`main`; see [Commit message format](#commit-message-format) below.

Dispatch the Release workflow manually from `main` to cut a stable release or from `beta` to cut a beta
prerelease. Every Conventional Commit type creates at least a patch release; `feat` commits create a minor
Expand Down
2 changes: 2 additions & 0 deletions src/BootUSBit.Wpf/BootUSBit.Wpf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<AssemblyName>BootUSBit</AssemblyName>
<ApplicationIcon>BootUSBit.ico</ApplicationIcon>
<TargetFramework>net10.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Binary file added src/BootUSBit.Wpf/BootUSBit.ico
Binary file not shown.
Loading