Skip to content

Commit bc0126d

Browse files
committed
Change default branch to main
1 parent 00426d6 commit bc0126d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/post-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: Post merge analysis
66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010

1111
jobs:
1212
analysis:

src/ci/scripts/verify-channel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
# We want to make sure all PRs are targeting the right branch when they're
33
# opened, otherwise we risk (for example) to land a beta-specific change to the
4-
# master branch. This script ensures the branch of the PR matches the channel.
4+
# default branch. This script ensures the branch of the PR matches the channel.
55

66
set -euo pipefail
77
IFS=$'\n\t'
@@ -16,7 +16,7 @@ fi
1616
channel=$(cat "$(ciCheckoutPath)/src/ci/channel")
1717
case "${channel}" in
1818
nightly)
19-
channel_branch="master"
19+
channel_branch="main"
2020
;;
2121
beta)
2222
channel_branch="beta"

src/stage0

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dist_server=https://static.rust-lang.org
22
artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds
33
artifacts_with_llvm_assertions_server=https://ci-artifacts.rust-lang.org/rustc-builds-alt
44
git_merge_commit_email=bors@rust-lang.org
5-
nightly_branch=master
5+
nightly_branch=main
66

77
# The configuration above this comment is editable, and can be changed
88
# by forks of the repository if they have alternate values.

triagebot.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ labels = ["has-merge-commits", "S-waiting-on-author"]
16631663
format = "rustc"
16641664
project-name = "Rust"
16651665
changelog-path = "RELEASES.md"
1666-
changelog-branch = "master"
1666+
changelog-branch = "main"
16671667

16681668
[shortcut]
16691669

0 commit comments

Comments
 (0)