Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace commit placeholder in vendor status with actual commit #139060

Conversation

Shourya742
Copy link
Contributor

@Shourya742 Shourya742 commented Mar 28, 2025

closes: #120499

try-job: dist-x86_64-illumos

@rustbot
Copy link
Collaborator

rustbot commented Mar 28, 2025

r? @onur-ozkan

rustbot has assigned @onur-ozkan.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 28, 2025
@rust-log-analyzer

This comment has been minimized.

@Shourya742 Shourya742 force-pushed the 2025-03-28-replace-commit-with-actual-value branch from 6a46304 to 077a9c2 Compare March 28, 2025 12:57
@rust-log-analyzer

This comment has been minimized.

@Shourya742 Shourya742 force-pushed the 2025-03-28-replace-commit-with-actual-value branch from 077a9c2 to 562efc9 Compare March 28, 2025 13:14
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 29, 2025
@Shourya742 Shourya742 force-pushed the 2025-03-28-replace-commit-with-actual-value branch from 5ac1e66 to 91d1dd4 Compare March 29, 2025 08:42
@Shourya742
Copy link
Contributor Author

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 29, 2025
@onur-ozkan
Copy link
Member

It looks good to me now, could you please squash your commits?

@Shourya742 Shourya742 force-pushed the 2025-03-28-replace-commit-with-actual-value branch from 91d1dd4 to 2ecaac3 Compare March 29, 2025 12:36
@Shourya742
Copy link
Contributor Author

It looks good to me now, could you please squash your commits?

done

@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 29, 2025

📌 Commit 2ecaac3 has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 29, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 29, 2025
…it-with-actual-value, r=onur-ozkan

replace commit placeholder in vendor status with actual commit

closes: rust-lang#120499
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 29, 2025
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#137928 (stabilize const_cell)
 - rust-lang#138431 (Fix `uclibc` LLVM target triples)
 - rust-lang#138832 (Start using `with_native_path` in `std::sys::fs`)
 - rust-lang#139060 (replace commit placeholder in vendor status with actual commit)
 - rust-lang#139081 (std: deduplicate `errno` accesses)
 - rust-lang#139100 (compiletest: Support matching diagnostics on lines below)
 - rust-lang#139105 (`BackendRepr::is_signed`: comment why this may panics)
 - rust-lang#139106 (Mark .pp files as Rust)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr
Copy link
Member

@bors r-
#139117 (comment)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 29, 2025
@Shourya742 Shourya742 force-pushed the 2025-03-28-replace-commit-with-actual-value branch 2 times, most recently from cfb06e5 to cdfed12 Compare March 30, 2025 02:01
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 1, 2025
…it-with-actual-value, r=onur-ozkan

replace commit placeholder in vendor status with actual commit

closes: rust-lang#120499
Zalathar added a commit to Zalathar/rust that referenced this pull request Apr 1, 2025
…it-with-actual-value, r=onur-ozkan

replace commit placeholder in vendor status with actual commit

closes: rust-lang#120499
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2025
Rollup of 12 pull requests

Successful merges:

 - rust-lang#110406 (rustdoc-json: Add test for #[automatically_derived] attribute)
 - rust-lang#137738 (Make slice iterator constructors unstably const)
 - rust-lang#138492 (remove `feature(inline_const_pat)`)
 - rust-lang#138928 (Fix UWP reparse point check)
 - rust-lang#138950 (replace extra_filename with strict version hash in metrics file names)
 - rust-lang#139002 (Add release notes for 1.86.0)
 - rust-lang#139022 (increment depth of nested obligations)
 - rust-lang#139060 (replace commit placeholder in vendor status with actual commit)
 - rust-lang#139102 (coverage: Avoid splitting spans during span extraction/refinement)
 - rust-lang#139129 (Add tests for slice bounds check optimization)
 - rust-lang#139188 (PassWrapper: adapt for llvm/llvm-project@94122d58fc77079a291a3d008914…)
 - rust-lang#139193 (Feed HIR for by-move coroutine body def, since the inliner tries to read its attrs)

r? `@ghost`
`@rustbot` modify labels: rollup
@fmease
Copy link
Member

fmease commented Apr 1, 2025

Failed in rollup: #139204 (comment)
@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 1, 2025
@Shourya742 Shourya742 force-pushed the 2025-03-28-replace-commit-with-actual-value branch from 4564280 to 2dc650b Compare April 1, 2025 11:51
@Shourya742
Copy link
Contributor Author

@rustbot review,

#139060 (comment)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 1, 2025
@onur-ozkan
Copy link
Member

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2025
…-with-actual-value, r=<try>

replace commit placeholder in vendor status with actual commit

closes: rust-lang#120499

try-job: dist-x86_64-illumos
@bors
Copy link
Collaborator

bors commented Apr 1, 2025

⌛ Trying commit 2dc650b with merge 8ed50ad...

@bors
Copy link
Collaborator

bors commented Apr 1, 2025

☀️ Try build successful - checks-actions
Build commit: 8ed50ad (8ed50adf2fac8f37c8a4bbbb5646b0fa23c89d71)

@onur-ozkan
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 1, 2025

📌 Commit 2dc650b has been approved by onur-ozkan

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 1, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2025
Rollup of 14 pull requests

Successful merges:

 - rust-lang#135295 (Check empty SIMD vector in inline asm)
 - rust-lang#138003 (Add the new `amx` target features and the `movrs` target feature)
 - rust-lang#138823 (rustc_target: RISC-V: add base `I`-related important extensions)
 - rust-lang#138913 (Remove even more instances of `@ts-expect-error` from search.js)
 - rust-lang#138941 (Do not mix normalized and unnormalized caller bounds when constructing param-env for `receiver_is_dispatchable`)
 - rust-lang#139060 (replace commit placeholder in vendor status with actual commit)
 - rust-lang#139102 (coverage: Avoid splitting spans during span extraction/refinement)
 - rust-lang#139191 (small opaque type/borrowck cleanup)
 - rust-lang#139200 (Skip suggest impl or dyn when poly trait is not a real trait)
 - rust-lang#139208 (fix dead link netbsd.md)
 - rust-lang#139210 (chore: remove redundant backtick)
 - rust-lang#139212 (Update mdbook to 0.4.48)
 - rust-lang#139214 (Tell rustfmt to use the 2024 edition in ./x.py fmt)
 - rust-lang#139225 (move autodiff from EnzymeAD/Enzyme to our rust-lang/Enzyme soft-fork)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 8420a55 into rust-lang:master Apr 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 2, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2025
Rollup merge of rust-lang#139060 - Shourya742:2025-03-28-replace-commit-with-actual-value, r=onur-ozkan

replace commit placeholder in vendor status with actual commit

closes: rust-lang#120499

try-job: dist-x86_64-illumos
@Kobzol
Copy link
Contributor

Kobzol commented Apr 7, 2025

This doesn't seem to work in CI:

2025-04-07T06:36:06.2397572Z [2025-04-07T06:36:06.239Z INFO  opt_dist::exec] Executing `RUST_BACKTRACE=full python3 /checkout/x.py build --target x86_64-unknown-linux-gnu --host x86_64-unknown-linux-gnu --stage 2 library/std --rust-profile-generate /tmp/tmp-multistage/opt-artifacts/rustc-pgo --set llvm.thin-lto=false --set llvm.link-shared=true [at /checkout/obj]`
2025-04-07T06:36:06.2399543Z ##[endgroup]
2025-04-07T06:36:06.3101153Z Unknown option: -C
2025-04-07T06:36:06.3101663Z usage: git [--version] [--help] [-c name=value]
2025-04-07T06:36:06.3102125Z            [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
2025-04-07T06:36:06.3102636Z            [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
2025-04-07T06:36:06.3103085Z            [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
2025-04-07T06:36:06.3103447Z            <command> [<args>]
2025-04-07T06:36:06.3177655Z ##[group]Building bootstrap

The git version on CI should be 2.48.1. Locally, with 2.43.0, the -C flag is there. It almost looks like git removed the option (?!).

@Kobzol
Copy link
Contributor

Kobzol commented Apr 7, 2025

I haven't found anything in the git changelog that would suggest that it was removed though. @Shourya742 Could you please try to take a look at how to fix this with the git that we use on CI?

@onur-ozkan
Copy link
Member

This doesn't seem to work in CI:

2025-04-07T06:36:06.2397572Z [2025-04-07T06:36:06.239Z INFO  opt_dist::exec] Executing `RUST_BACKTRACE=full python3 /checkout/x.py build --target x86_64-unknown-linux-gnu --host x86_64-unknown-linux-gnu --stage 2 library/std --rust-profile-generate /tmp/tmp-multistage/opt-artifacts/rustc-pgo --set llvm.thin-lto=false --set llvm.link-shared=true [at /checkout/obj]`
2025-04-07T06:36:06.2399543Z ##[endgroup]
2025-04-07T06:36:06.3101153Z Unknown option: -C
2025-04-07T06:36:06.3101663Z usage: git [--version] [--help] [-c name=value]
2025-04-07T06:36:06.3102125Z            [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
2025-04-07T06:36:06.3102636Z            [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]
2025-04-07T06:36:06.3103085Z            [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
2025-04-07T06:36:06.3103447Z            <command> [<args>]
2025-04-07T06:36:06.3177655Z ##[group]Building bootstrap

The git version on CI should be 2.48.1. Locally, with 2.43.0, the -C flag is there. It almost looks like git removed the option (?!).

Where did this fail? This isn't a game changer improvement so feel free to revert it if it's being a blocker or something.

@Kobzol
Copy link
Contributor

Kobzol commented Apr 7, 2025

It fails e.g. in dist-x86_64-linux. The error is ignores, so it doesn't block CI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

replace <commit> placeholder with the actual commit in vendoring error
8 participants