Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: Post merge analysis
on:
push:
branches:
- master
- main

jobs:
analysis:
Expand Down
4 changes: 2 additions & 2 deletions src/ci/scripts/verify-channel.sh
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/stage0
Original file line number Diff line number Diff line change
Expand Up @@ -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
[email protected]
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.
Expand Down
2 changes: 1 addition & 1 deletion triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Loading