This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-graalvm-distro.git
The following commit(s) were added to refs/heads/master by this push:
new 014755f Rename default branch from main to master
014755f is described below
commit 014755fee6a7eaac608a4db5b8e9f53f346ead83
Author: Wu Sheng <[email protected]>
AuthorDate: Sun Mar 15 11:48:24 2026 +0800
Rename default branch from main to master
---
.asf.yaml | 3 ++-
.claude/skills/gh-pull-request/SKILL.md | 4 ++--
.github/workflows/ci.yml | 4 ++--
docs/release-guide.md | 8 ++++----
release/full-release.sh | 20 ++++++++++----------
release/pre-release.sh | 2 +-
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 68b8629..2ccbf29 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -15,6 +15,7 @@
github:
description: GraalVM native-image distribution of Apache SkyWalking OAP
server
+ default_branch: master
homepage: https://skywalking.apache.org/
labels:
- skywalking
@@ -28,6 +29,6 @@ github:
rebase: false
dependabot_updates: false
protected_branches:
- main:
+ master:
required_pull_request_reviews:
required_approving_review_count: 0
diff --git a/.claude/skills/gh-pull-request/SKILL.md
b/.claude/skills/gh-pull-request/SKILL.md
index 92a237a..60db4b3 100644
--- a/.claude/skills/gh-pull-request/SKILL.md
+++ b/.claude/skills/gh-pull-request/SKILL.md
@@ -36,8 +36,8 @@ git push -u origin <branch-name>
```
### Branch strategy
-- **Never work directly on main branch**
-- If on main, create a new branch first: `git checkout -b feature/<name>` or
`git checkout -b fix/<name>`
+- **Never work directly on master branch**
+- If on master, create a new branch first: `git checkout -b feature/<name>` or
`git checkout -b fix/<name>`
## Create PR (if not yet created)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a86a61a..921f405 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,11 +17,11 @@ name: CI
on:
push:
- branches: [ main ]
+ branches: [ master ]
tags:
- 'v*'
pull_request:
- branches: [ main ]
+ branches: [ master ]
workflow_dispatch:
inputs:
commit:
diff --git a/docs/release-guide.md b/docs/release-guide.md
index 42f6c6a..5692556 100644
--- a/docs/release-guide.md
+++ b/docs/release-guide.md
@@ -51,13 +51,13 @@ release/full-release.sh
The script orchestrates `pre-release.sh` and `release.sh` with CI polling in
between:
-1. **Pre-flight checks** — validates tools, GPG key (`@apache.org`), clean
`main` branch,
+1. **Pre-flight checks** — validates tools, GPG key (`@apache.org`), clean
`master` branch,
up-to-date with remote, `gh` authentication
2. **Calls `pre-release.sh`** — prompts for release version and next SNAPSHOT
version,
bumps all `pom.xml` files, commits, creates tag
3. **Pushes tag** — triggers CI release build (Linux native binaries + Docker
+ GitHub Release)
4. **Creates PR** — moves the SNAPSHOT bump commit to a branch
(`version/{next}-SNAPSHOT`),
- resets `main` to the tagged release commit, creates a PR for the version
bump
+ resets `master` to the tagged release commit, creates a PR for the version
bump
5. **Polls CI** — checks tag build status every 30s until green (~30-45 min)
6. **Calls `release.sh`** — builds macOS native binary, creates source tarball,
signs all artifacts, uploads to SVN, generates vote email
@@ -88,7 +88,7 @@ After the script completes, review and push:
```bash
git log --oneline -3
git push origin v0.1.0 # triggers CI release build
-git push origin main # push next SNAPSHOT version
+git push origin master # push next SNAPSHOT version
```
### Step 2: Wait for CI
@@ -159,7 +159,7 @@ release/full-release.sh
# Manual — three steps
release/pre-release.sh # 1. bump version, tag, next SNAPSHOT
git push origin v0.1.0 # push tag (triggers CI)
-git push origin main # push next SNAPSHOT
+git push origin master # push next SNAPSHOT
# 2. wait for CI to go green
release/release.sh 0.1.0 # 3. package, sign, SVN upload, vote email
```
diff --git a/release/full-release.sh b/release/full-release.sh
index d1aee1f..b7ea51e 100755
--- a/release/full-release.sh
+++ b/release/full-release.sh
@@ -46,18 +46,18 @@ log " Tools: OK"
cd "${REPO_ROOT}"
CURRENT_BRANCH=$(git branch --show-current)
-[[ "${CURRENT_BRANCH}" == "main" ]] \
+[[ "${CURRENT_BRANCH}" == "master" ]] \
|| error "Must be on 'main' branch (currently on '${CURRENT_BRANCH}')"
[[ -z "$(git status --porcelain)" ]] \
|| error "Working tree is not clean. Commit or stash changes first."
-git fetch origin main --quiet
+git fetch origin master --quiet
LOCAL_SHA=$(git rev-parse HEAD)
-REMOTE_SHA=$(git rev-parse origin/main)
+REMOTE_SHA=$(git rev-parse origin/master)
[[ "${LOCAL_SHA}" == "${REMOTE_SHA}" ]] \
- || error "Local main (${LOCAL_SHA:0:8}) differs from origin/main
(${REMOTE_SHA:0:8}). Pull or push first."
-log " Branch: main, clean, up to date"
+ || error "Local master (${LOCAL_SHA:0:8}) differs from origin/master
(${REMOTE_SHA:0:8}). Pull or push first."
+log " Branch: master, clean, up to date"
GPG_EMAIL=$(gpg --list-secret-keys --keyid-format LONG 2>/dev/null \
| grep "uid" | head -1 | sed 's/.*<\(.*\)>.*/\1/')
@@ -85,16 +85,16 @@ SNAPSHOT_BRANCH="version/${NEXT_VERSION}"
log "Detected: release=${RELEASE_VERSION}, tag=${TAG}, next=${NEXT_VERSION}"
# ─── Step 4: Move snapshot commit to PR branch ──────────────────────────────
-# Current state: main has [Release X.Y.Z] -> [Bump version to X.Y.Z-SNAPSHOT]
-# We want: main stays at [Release X.Y.Z], PR branch has [Bump version to
X.Y.Z-SNAPSHOT]
+# Current state: master has [Release X.Y.Z] -> [Bump version to X.Y.Z-SNAPSHOT]
+# We want: master stays at [Release X.Y.Z], PR branch has [Bump version to
X.Y.Z-SNAPSHOT]
log "Moving snapshot commit to branch ${SNAPSHOT_BRANCH}..."
# Create PR branch from current HEAD (which includes the snapshot bump)
git checkout -b "${SNAPSHOT_BRANCH}"
-# Reset main back to the release commit (the tagged one)
-git checkout main
+# Reset master back to the release commit (the tagged one)
+git checkout master
git reset --hard "${TAG}"
# ─── Step 5: Push tag and PR branch ─────────────────────────────────────────
@@ -115,7 +115,7 @@ Automated version bump after release ${RELEASE_VERSION}.
- Created by \`release/full-release.sh\`
EOF
)" \
- --base main \
+ --base master \
--head "${SNAPSHOT_BRANCH}" \
2>&1)
log "PR created: ${PR_URL}"
diff --git a/release/pre-release.sh b/release/pre-release.sh
index 0a9005e..67d419f 100755
--- a/release/pre-release.sh
+++ b/release/pre-release.sh
@@ -104,6 +104,6 @@ echo ""
echo "Next steps:"
echo " 1. Review commits: git log --oneline -3"
echo " 2. Push tag: git push origin v${RELEASE_VERSION}"
-echo " 3. Push branch: git push origin main"
+echo " 3. Push branch: git push origin master"
echo " 4. Wait for CI release workflow to complete"
echo " 5. Run: release/release.sh ${RELEASE_VERSION}"
