From cd66f552b0a516b78d5e5bb7c02a35b33fd1599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Wed, 16 Sep 2026 11:51:46 +0200 Subject: [PATCH] Switch the default branch to main --- .github/workflows/ci.yml | 2 +- .github/workflows/doc.yml | 2 +- README.md | 2 +- subtree-sync.sh | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 42cf754e37b..dff4923af3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: pull_request: push: branches: - - master + - main env: CARGO_NET_RETRY: 10 diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 22c2cb3f67f..c73fb0783b3 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -3,7 +3,7 @@ name: Documentation on: push: branches: - - master + - main jobs: release: diff --git a/README.md b/README.md index e8ac600debe..6f7e402d058 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # The Rust standard library's portable SIMD API -![Build Status](https://github.com/rust-lang/portable-simd/actions/workflows/ci.yml/badge.svg?branch=master) +![Build Status](https://github.com/rust-lang/portable-simd/actions/workflows/ci.yml/badge.svg?branch=main) Code repository for the [Portable SIMD Project Group](https://github.com/rust-lang/project-portable-simd). Please refer to [CONTRIBUTING.md](./CONTRIBUTING.md) for our contributing guidelines. diff --git a/subtree-sync.sh b/subtree-sync.sh index eab56bd03c6..257a5a63a50 100755 --- a/subtree-sync.sh +++ b/subtree-sync.sh @@ -30,14 +30,14 @@ case $1 in merge=sync-from-rust-$today pushd $2 - git checkout master + git checkout main git pull popd library/portable-simd/git-subtree.sh push -P library/portable-simd $2 $upstream pushd $2 - git checkout -B $merge origin/master + git checkout -B $merge origin/main git merge $upstream popd echo "Branch \`$merge\` created in \`$2\`. You may need to resolve merge conflicts." @@ -47,6 +47,6 @@ case $1 in git checkout -B $branch echo "Creating branch \`$branch\`... You may need to resolve merge conflicts." - library/portable-simd/git-subtree.sh pull -P library/portable-simd $2 origin/master + library/portable-simd/git-subtree.sh pull -P library/portable-simd $2 origin/main ;; esac