Skip to content

[DO NOT MERGE] debug (stable) #135168

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

[DO NOT MERGE] debug (stable) #135168

wants to merge 4 commits into from

Conversation

@jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Jan 6, 2025

r? @ghost

Noratrieb and others added 3 commits January 6, 2025 17:06
@Noratrieb @pietroalbini
Pass objcopy args for stripping on OSX
70246e6 
When `-Cstrip` was changed to use the bundled rust-objcopy instead of
/usr/bin/strip on OSX, strip-like arguments were preserved.

But strip and objcopy are, while being the same binary, different, they
have different defaults depending on which binary they are.
Notably, strip strips everything by default, and objcopy doesn't strip
anything by default.

Additionally, `-S` actually means `--strip-all`, so debuginfo stripped
everything and symbols didn't strip anything.

We now correctly pass `--strip-debug` and `--strip-all`.
@pietroalbini
squash relnotes updates
6fccb3c
@pietroalbini
bump channel to stable
fb95f00
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Jan 6, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu jieyouxu changed the title [DO NOT MERGE] debug [DO NOT MERGE] debug (stable) Jan 6, 2025
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member Author

jieyouxu commented Jan 6, 2025 •
edited
Loading

I can't tell if this is a problem

2025-01-06T18:13:44.3152401Z fatal: unknown commit origin/beta
2025-01-06T18:13:44.3154912Z All commits in `HEAD` are present in `beta`

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Jan 6, 2025

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
  PR_CI_JOB: 1
  IMAGE: x86_64-gnu-tools
##[endgroup]
fatal: unknown commit origin/beta
All commits in `HEAD` are present in `beta`
src/ci/scripts/verify-stable-version-number.sh
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
[DEBUG] stderr:



merge_base failed: command did not execute successfully: cd "/checkout" && "git" "merge-base" "origin/master" "HEAD"

thread 'main' panicked at src/core/config/config.rs:2908:89:
thread 'main' panicked at src/core/config/config.rs:2908:89:
called `Result::unwrap()` on an `Err` value: "command did not execute successfully: cd \"/checkout\" && \"git\" \"merge-base\" \"origin/master\" \"HEAD\"\nexpected success, got: exit status: 1\n"
Build completed unsuccessfully in 0:00:26
make: *** [Makefile:98: prepare] Error 1
Command failed. Attempt 2/5:
##[group]Building bootstrap
---
[DEBUG] stderr:



merge_base failed: command did not execute successfully: cd "/checkout" && "git" "merge-base" "origin/master" "HEAD"

thread 'main' panicked at src/core/config/config.rs:2908:89:
thread 'main' panicked at src/core/config/config.rs:2908:89:
called `Result::unwrap()` on an `Err` value: "command did not execute successfully: cd \"/checkout\" && \"git\" \"merge-base\" \"origin/master\" \"HEAD\"\nexpected success, got: exit status: 1\n"
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:98: prepare] Error 1
Command failed. Attempt 3/5:
##[group]Building bootstrap
---
[DEBUG] stderr:



merge_base failed: command did not execute successfully: cd "/checkout" && "git" "merge-base" "origin/master" "HEAD"

thread 'main' panicked at src/core/config/config.rs:2908:89:
thread 'main' panicked at src/core/config/config.rs:2908:89:
called `Result::unwrap()` on an `Err` value: "command did not execute successfully: cd \"/checkout\" && \"git\" \"merge-base\" \"origin/master\" \"HEAD\"\nexpected success, got: exit status: 1\n"
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:98: prepare] Error 1
Command failed. Attempt 4/5:
##[group]Building bootstrap
---
[DEBUG] stderr:



merge_base failed: command did not execute successfully: cd "/checkout" && "git" "merge-base" "origin/master" "HEAD"

thread 'main' panicked at src/core/config/config.rs:2908:89:
thread 'main' panicked at src/core/config/config.rs:2908:89:
called `Result::unwrap()` on an `Err` value: "command did not execute successfully: cd \"/checkout\" && \"git\" \"merge-base\" \"origin/master\" \"HEAD\"\nexpected success, got: exit status: 1\n"
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:98: prepare] Error 1
Command failed. Attempt 5/5:
##[group]Building bootstrap
---
[DEBUG] stderr:



merge_base failed: command did not execute successfully: cd "/checkout" && "git" "merge-base" "origin/master" "HEAD"

thread 'main' panicked at src/core/config/config.rs:2908:89:
thread 'main' panicked at src/core/config/config.rs:2908:89:
called `Result::unwrap()` on an `Err` value: "command did not execute successfully: cd \"/checkout\" && \"git\" \"merge-base\" \"origin/master\" \"HEAD\"\nexpected success, got: exit status: 1\n"
Build completed unsuccessfully in 0:00:02
make: *** [Makefile:98: prepare] Error 1
The command has failed after 5 attempts.
  local time: Mon Jan  6 19:01:58 UTC 2025

@jieyouxu
Copy link
Member Author

jieyouxu commented Jan 6, 2025

There's no error messages when git merge-base errors (i.e. exit status 1), I have found out

@jieyouxu jieyouxu closed this Jan 6, 2025
@jieyouxu jieyouxu deleted the pr/135162 branch January 6, 2025 19:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jieyouxu @rust-log-analyzer @rustbot @Noratrieb @pietroalbini