From d3373e8d0b52cc8aa1b67c66d9139c77ce15884b Mon Sep 17 00:00:00 2001 From: Stuart Meeks Date: Sat, 30 May 2026 08:42:49 +0000 Subject: [PATCH] Update master references to main after default-branch rename The default branch was renamed master -> main. Fix the one functional reference (ci.yml pull_request branch filter, which would otherwise stop triggering PR CI) and the doc/prose mentions in CONTRIBUTING.md and TODO.md. Co-Authored-By: Claude Opus 4.8 --- .github/workflows/ci.yml | 2 +- CONTRIBUTING.md | 6 +++--- TODO.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a06aadd..1c65245 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: branches: ['**'] pull_request: - branches: [master] + branches: [main] concurrency: group: ci-${{ github.ref }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 60068fb..cead4cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -118,7 +118,7 @@ name matches the computed version** (install once with `dotnet tool install --global nbgv`): ``` -git checkout master && git pull +git checkout main && git pull nbgv tag # mints e.g. v0.1.0-alpha.7 for the current commit git push origin v0.1.0-alpha.7 ``` @@ -129,11 +129,11 @@ the version from `nbgv get-version` (asserting it's a public release per attaches the artefacts to a new GitHub Release. The hyphen in the version (`-alpha`, `-beta`, …) marks the GitHub release as a pre-release and feeds Velopack's channel name. Don't tag from feature branches — release from -`master`. +`main`. To cut a **stable** release (or move to a new line), edit `version.json` first — e.g. `0.1.0-alpha.{height}` → `0.1.0` for the first stable, or bump to -`0.2.0-alpha.{height}` — commit that on `master`, then `nbgv tag` and push. +`0.2.0-alpha.{height}` — commit that on `main`, then `nbgv tag` and push. ## Asking for direction diff --git a/TODO.md b/TODO.md index 40f789a..274f915 100644 --- a/TODO.md +++ b/TODO.md @@ -364,7 +364,7 @@ build-and-debug cycle relied heavily on PRs as the feedback loop: local Linux can't build the `Snipdeck.App` project (the WinUI XAML compiler is Windows-only), so analyser errors / build breaks only surface in CI. Each round-trip is a PR, which generates churn and -sometimes ends with master broken (PR #13 was merged with red CI). +sometimes ends with main broken (PR #13 was merged with red CI). **Idea.** Three independent improvements; each is small, all three together would make the iteration loop tight. @@ -379,7 +379,7 @@ together would make the iteration loop tight. editorconfig violations (IDE0058, IDE0330, IDE0370, IDE0005 — all hit in this session) before the push. - **Branch protection: require status checks to pass.** Add a rule to - the existing branch ruleset on `master` that requires the + the existing branch ruleset on `main` that requires the `App build (windows)` and `Core build + tests (ubuntu)` checks to be green before the Merge button activates. Mechanical guardrail against the merged-red scenario. @@ -390,7 +390,7 @@ together would make the iteration loop tight. commit per change, which is what the project's commit log wants. Auto-mode currently blocks `git push --force-with-lease` — would need an explicit settings.json permission or a one-off approval - to enable. Force-push to `master` itself stays blocked. + to enable. Force-push to `main` itself stays blocked. **Sequencing.** Do `EnableWindowsTargeting` first (cheapest, biggest quality-of-life win for me); then branch protection (one-off setup,