Skip to content

Commit 2cfb3f8

Browse files
DonKirkhamclaude
andauthored
chore: rename default branch from master to main (#120)
Update CI trigger, release skill, and publish docs to reference the main branch ahead of renaming the default branch on GitHub. Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 814fa32 commit 2cfb3f8

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

.claude/skills/spfx-release/SKILL.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Before making changes, verify:
2020

2121
## Steps to perform
2222

23-
1. **Create a release branch** from the latest master:
23+
1. **Create a release branch** from the latest main:
2424
```
25-
git checkout master && git pull
25+
git checkout main && git pull
2626
git checkout -b release/v$ARGUMENTS
2727
```
2828
Branch name must be valid git (no spaces, no colons).
@@ -35,7 +35,7 @@ Before making changes, verify:
3535

3636
3. **Commit changes** with message: `SPFx v$ARGUMENTS - new version updates`
3737

38-
4. **Squash commits on the release branch** (release branch only — never on master, since unrelated commits between the last tag and HEAD would get folded in):
38+
4. **Squash commits on the release branch** (release branch only — never on main, since unrelated commits between the last tag and HEAD would get folded in):
3939
- Get the last tag: `git describe --tags --abbrev=0`
4040
- Soft reset to that tag: `git reset --soft <last-tag>`
4141
- Re-commit with the same message.
@@ -46,9 +46,9 @@ Before making changes, verify:
4646
gh pr create --title "feat: new SPFx version v$ARGUMENTS" --body "..."
4747
```
4848

49-
6. **After the PR merges**, create and push the tag against the merged commit on master:
49+
6. **After the PR merges**, create and push the tag against the merged commit on main:
5050
```
51-
git checkout master && git pull
51+
git checkout main && git pull
5252
git tag v$ARGUMENTS
5353
git push origin v$ARGUMENTS
5454
```

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: ci
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
build:

build-and-push.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
![Docker PAT result](assets/docker-pat.png)
1212
7. Open Environments in Settings of the Github project: https://github.com/pnp/docker-spfx/settings/environments
1313
8. Create a new invironment called `DockerHubProd`
14-
9. Add necessary protection to the environment. For example, you can choose `Protected branches only` so only commits merged to `master` branch will be able to have access for publishing images to Docker Hub
14+
9. Add necessary protection to the environment. For example, you can choose `Protected branches only` so only commits merged to `main` branch will be able to have access for publishing images to Docker Hub
1515
10. Create `DOCKER_ORG` environment variable and set value to `m365pnp`.
1616
11. Create `DOCKER_USERNAME` environment variable and set value that you got in the Docker page above.
1717
12. Create `DOCKER_PASSWORD` environment secret and set value that you got in the Docker page above.

0 commit comments

Comments
 (0)