Skip to content

Rename the master branch to main#30788

Merged
mrobinson merged 1 commit intoservo:mainfrom
mrobinson:main-branch
Dec 4, 2023
Merged

Rename the master branch to main#30788
mrobinson merged 1 commit intoservo:mainfrom
mrobinson:main-branch

Conversation

@mrobinson
Copy link
Member


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes do not require tests because they do not change behavior.

@mrobinson mrobinson merged commit 23add0c into servo:main Dec 4, 2023
@mrobinson mrobinson deleted the main-branch branch December 4, 2023 09:12
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 4, 2023
…Simulacrum

Don't ask for a specific branch in cargotest

Tentative fix for rust-lang#118592 (comment).

`servo` [just renamed](servo/servo#30788) their `master` branch to `main`, but `cargotest` does a `git fetch $URL master; git reset --hard $SHA`. Let's try to change that to `git fetch $URL $SHA; git reset --hard $SHA`, which appears to work, but I can't confirm for sure because I'm having some trouble with `x.py`:

```
 --> library/rustc-std-workspace-core/lib.rs:4:9
  |
4 | pub use core::*;
  |         ^^^^
  |
  = note: the following crate versions were found:
          crate `core` compiled by rustc 1.76.0-nightly (85a4bd8 2023-12-04): ./build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcore-70719e8645e6f000.rmeta
  = help: please recompile that crate using this compiler (rustc 1.76.0-nightly (5808b72 2023-12-04)) (consider running `cargo clean` first)
```
@delan delan mentioned this pull request Dec 13, 2023
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants