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.

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

Silence double-symlink errors while building solaris toolchain #126011

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Silence double-symlink errors while building solaris toolchain #126011

merged 2 commits into from
Jun 5, 2024

Conversation

workingjubilee
Copy link
Member

Intended to address the current issues with the tree.

@rustbot
Copy link
Collaborator

rustbot commented Jun 5, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
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 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jun 5, 2024
@workingjubilee
Copy link
Member Author

workingjubilee commented Jun 5, 2024 •
edited
Loading

Sorry for taking so long, I had to suddenly learn Docker and then tried a few different alternate solutions that might amount to more than a temporary bandaid. None of them proved satisfactory.

@workingjubilee
Copy link
Member Author

@bors r+ p=101 rollup=never

@bors
Copy link
Contributor

bors commented Jun 5, 2024

📌 Commit 40291bc has been approved by workingjubilee

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jun 5, 2024

🌲 The tree is currently closed for pull requests below priority 101. This pull request will be tested once the tree is reopened.

@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 Jun 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2024
@bors
Auto merge of rust-lang#126011 - workingjubilee:try-fix-solaris-build…
777e48d 
…, r=workingjubilee

Silence double-symlink errors while building solaris toolchain

Intended to address the current issues with the tree.
@bors
Copy link
Contributor

bors commented Jun 5, 2024

⌛ Testing commit 40291bc with merge 777e48d...

@workingjubilee workingjubilee mentioned this pull request Jun 5, 2024
Closed
@workingjubilee
Copy link
Member Author

From local testing I believe it's possible to remove the symlink generation step entirely but I don't want to play games while the tree is frozen by this.

@workingjubilee
Copy link
Member Author

dist-various-2 has successfully built the x86_64-pc-solaris distribution toolchain.

@workingjubilee
Copy link
Member Author

workingjubilee commented Jun 5, 2024 •
edited
Loading

If this dies on toolstate (still possible) I'm going to push the cherry-pick of ehuss's PR and retry this

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@workingjubilee
Copy link
Member Author

nice.

@workingjubilee
Copy link
Member Author

@bors r+ p=9001

@bors
Copy link
Contributor

bors commented Jun 5, 2024

📌 Commit f9150f6 has been approved by workingjubilee

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Jun 5, 2024

⌛ Testing commit f9150f6 with merge 5ee2dfd...

@workingjubilee
Copy link
Member Author

Toolstate on MSVC cleared.

@workingjubilee
Copy link
Member Author

It's all over, but...
It's all over but the crying... by The Ink Spots, a 1947 singing quartet

@workingjubilee
Copy link
Member Author

@bors treeclosed=0

@bors
Copy link
Contributor

bors commented Jun 5, 2024

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 5ee2dfd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 5, 2024
@bors bors merged commit 5ee2dfd into rust-lang:master Jun 5, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Jun 5, 2024
@workingjubilee workingjubilee deleted the try-fix-solaris-build branch June 5, 2024 10:42
@workingjubilee workingjubilee mentioned this pull request Jun 5, 2024
Open
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (5ee2dfd): 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)

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

Cycles

Results (primary 3.8%, secondary -2.2%)

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)		 3.8% [3.8%, 3.8%] 1
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.2% [-2.2%, -2.2%] 1
All ❌✅ (primary) 3.8% [3.8%, 3.8%] 1

Binary size

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

Bootstrap: 667.402s -> 669.008s (0.24%)
Artifact size: 318.98 MiB -> 318.95 MiB (-0.01%)

@compiler-errors
Copy link
Member

@bors treeclosed-

This was referenced Jun 7, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126093 - cuviper:beta-next, r=cuviper
f4d7315 
[beta] backports

- Fix insufficient logic when searching for the underlying allocation rust-lang#124761
- Handle field projections like slice indexing in invalid_reference_casting rust-lang#124908
- Handle Deref expressions in invalid_reference_casting rust-lang#124978
- Fix ICE in non-operand `aggregate_raw_ptr` instrinsic codegen rust-lang#125184
- Wrap Context.ext in AssertUnwindSafe rust-lang#125392
- Revert problematic opaque type change rust-lang#125489
- ast: Revert a breaking attribute visiting order change rust-lang#125734
- Update to LLVM 18.1.7 rust-lang#126061
- Revert "Disallow ambiguous attributes on expressions" on beta rust-lang#126102 / rust-lang#126101
- Silence double-symlink errors while building solaris toolchain rust-lang#126011

r? cuviper
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 7, 2024
@bors
Auto merge of rust-lang#126093 - cuviper:beta-next, r=cuviper
7bb6510 
[beta] backports

- Fix insufficient logic when searching for the underlying allocation rust-lang#124761
- Handle field projections like slice indexing in invalid_reference_casting rust-lang#124908
- Handle Deref expressions in invalid_reference_casting rust-lang#124978
- Fix ICE in non-operand `aggregate_raw_ptr` instrinsic codegen rust-lang#125184
- Wrap Context.ext in AssertUnwindSafe rust-lang#125392
- Revert problematic opaque type change rust-lang#125489
- ast: Revert a breaking attribute visiting order change rust-lang#125734
- Update to LLVM 18.1.7 rust-lang#126061
- Revert "Disallow ambiguous attributes on expressions" on beta rust-lang#126102 / rust-lang#126101
- Silence double-symlink errors while building solaris toolchain rust-lang#126011

r? cuviper
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.80.0
Development

Successfully merging this pull request may close these issues.
8 participants
@workingjubilee @rustbot @bors @rust-log-analyzer @rust-timer @compiler-errors @Mark-Simulacrum @ehuss