Rename the master branch to main#30788
Merged
mrobinson merged 1 commit intoservo:mainfrom Dec 4, 2023
Merged
Conversation
mukilan
approved these changes
Dec 1, 2023
This was referenced Dec 4, 2023
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) ```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errors