parent
953e1eaa8a
commit
a81d13f102
4 changed files with 5 additions and 5 deletions
2
.github/workflows/post-merge.yml
vendored
2
.github/workflows/post-merge.yml
vendored
|
|
@ -6,7 +6,7 @@ name: Post merge analysis
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
|
||||
jobs:
|
||||
analysis:
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -1605,7 +1605,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]
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue