Skip to content

Update master references to main after default-branch rename #26

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

Merged
StuartMeeks merged 1 commit into from
May 30, 2026
Merged

Update master references to main after default-branch rename #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: ['**']
pull_request:
branches: [master]
branches: [main]

concurrency:
group: ci-${{ github.ref }}
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions TODO.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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,
Expand Down
Loading