Don't ask for a specific branch in cargotest

[lnicola]

Tentative fix for #118592 (comment).

servo just renamed 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 (85a4bd8f5 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 (5808b7248 2023-12-04)) (consider running `cargo clean` first)

[rustbot]

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

[compiler-errors]

@bors treeclosed=10

@bors p=11

closing tree until this is fixed

looks reasonable to me, but idk anything about this code so i will not r+

[compiler-errors]

pls update/flesh out description :)

[lnicola]

Done, thank you.

[onur-ozkan]

Removing hard-coded branch name seems good to me. However, you still need to bump the commit sha of servo as it no longer exists.

Copied from CI logs

Initialized empty Git repository in /checkout/obj/build/ct/servo/.git/
fatal: Could not parse object '785a344e32db58d4e631fd3cae17fd1f29a721ab'.
fatal: couldn't find remote ref master

[lnicola]

No, the commit exists:

commit 785a344e32db58d4e631fd3cae17fd1f29a721ab (HEAD -> master)
Author: Anthony Ramine <[email protected]>
Date:   Wed Oct 16 14:07:39 2019 +0200

    Update rand to 0.7 (fixes #24448)

(also at https://github.com/servo/servo/tree/785a344e32db58d4e631fd3cae17fd1f29a721ab)

It's master that no longer does. I don't understand why it ends up showing that error.

[onur-ozkan]

No, the commit exists:

commit 785a344e32db58d4e631fd3cae17fd1f29a721ab (HEAD -> master)
Author: Anthony Ramine <[email protected]>
Date:   Wed Oct 16 14:07:39 2019 +0200

    Update rand to 0.7 (fixes #24448)

(also at https://github.com/servo/servo/tree/785a344e32db58d4e631fd3cae17fd1f29a721ab)

It's master that no longer does. I don't understand why it ends up showing that error.

I get it now. From the following code we try to do hard-reset to specific commit hash, and in the initial iteration we haven't fetched the servo yet. This results in the mentioned error.

I don't know why fn clone_repo had to be that complicated.

[Mark-Simulacrum]

@bors r+ p=10

[bors]

📌 Commit 5808b72 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

[bors]

⌛ Testing commit 5808b72 with merge 0a83e43...

[compiler-errors]

@bors treeclosed-

[bors]

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 0a83e43 to master...

[rust-timer]

Finished benchmarking commit (0a83e43): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.3%	[3.3%, 3.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.7%	[-2.7%, -2.7%]	1
All ❌✅ (primary)	-	-	0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 673.967s -> 673.138s (-0.12%)
Artifact size: 314.12 MiB -> 314.10 MiB (-0.01%)