diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index b4848a8cf099b..d38cc0e8a17f3 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -6,7 +6,7 @@ name: Post merge analysis on: push: branches: - - master + - main jobs: analysis: diff --git a/src/ci/scripts/verify-channel.sh b/src/ci/scripts/verify-channel.sh index edeea20144be3..9a9e713243d76 100755 --- a/src/ci/scripts/verify-channel.sh +++ b/src/ci/scripts/verify-channel.sh @@ -1,7 +1,7 @@ #!/bin/bash # We want to make sure all PRs are targeting the right branch when they're # opened, otherwise we risk (for example) to land a beta-specific change to the -# master branch. This script ensures the branch of the PR matches the channel. +# default branch. This script ensures the branch of the PR matches the channel. set -euo pipefail IFS=$'\n\t' @@ -16,7 +16,7 @@ fi channel=$(cat "$(ciCheckoutPath)/src/ci/channel") case "${channel}" in nightly) - channel_branch="master" + channel_branch="main" ;; beta) channel_branch="beta" diff --git a/src/stage0 b/src/stage0 index 43e1a635a42ce..0e4e9eb1c4b92 100644 --- a/src/stage0 +++ b/src/stage0 @@ -2,7 +2,7 @@ dist_server=https://static.rust-lang.org artifacts_server=https://ci-artifacts.rust-lang.org/rustc-builds artifacts_with_llvm_assertions_server=https://ci-artifacts.rust-lang.org/rustc-builds-alt git_merge_commit_email=bors@rust-lang.org -nightly_branch=master +nightly_branch=main # The configuration above this comment is editable, and can be changed # by forks of the repository if they have alternate values. diff --git a/triagebot.toml b/triagebot.toml index b9739149ea837..adc73c42c428c 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -1663,7 +1663,7 @@ labels = ["has-merge-commits", "S-waiting-on-author"] format = "rustc" project-name = "Rust" changelog-path = "RELEASES.md" -changelog-branch = "master" +changelog-branch = "main" [shortcut]