CI: build FreeBSD artifacts on FreeBSD 13.4 #132232

asomers · 2024-10-27T17:59:15Z

13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture().

Fixes #132185

cc @ehuss . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names.

try-job: dist-x86_64-freebsd
try-job: dist-various-2

rustbot · 2024-10-27T17:59:24Z

r? @GuillaumeGomez

rustbot has assigned @GuillaumeGomez.
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

src/ci/docker/scripts/freebsd-toolchain.sh

asomers · 2024-10-28T12:55:36Z

@ehuss it should be ready to try now.

ehuss · 2024-10-28T13:05:26Z

Hm, I'm not sure if this will work with conflicts.

@bors try

bors · 2024-10-28T13:06:37Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout fbsd-13.4 (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self fbsd-13.4 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging src/doc/rustc/src/platform-support.md
CONFLICT (content): Merge conflict in src/doc/rustc/src/platform-support.md
Auto-merging src/ci/docker/scripts/freebsd-toolchain.sh
CONFLICT (content): Merge conflict in src/ci/docker/scripts/freebsd-toolchain.sh
Automatic merge failed; fix conflicts and then commit the result.

ehuss · 2024-10-28T13:06:59Z

Yea, can you resolve the conflicts first?

asomers · 2024-10-28T13:35:40Z

@ehuss resolved.

Mark-Simulacrum · 2024-10-28T13:47:12Z

@bors try

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc `@ehuss` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd

bors · 2024-10-28T13:48:25Z

⌛ Trying commit 4c9126d with merge 89700f8...

bors · 2024-10-28T14:11:13Z

💔 Test failed - checks-actions

13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185

asomers · 2024-10-28T14:59:34Z

That build failure was due to a merge error. @Mark-Simulacrum @ehuss can you please try again?

ehuss · 2024-10-28T15:00:48Z

@bors try

bors · 2024-10-28T15:01:58Z

⌛ Trying commit cf34545 with merge 3b8bd37...

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc `@ehuss` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd

bors · 2024-10-28T18:02:59Z

☀️ Try build successful - checks-actions
Build commit: 3b8bd37 (3b8bd37613f81d4a0b15cc3e13f5ea7aeeaf2fae)

asomers · 2024-10-28T18:34:57Z

@ehuss could you please explain to me how to download the artifacts?

Urgau · 2024-10-28T20:55:41Z

You can use rustup-toolchain-install-master to manage try-builded toolchains.
See the usage sections for a detailed workflow.

The sha to use is the one from the build commit.

asomers · 2024-10-28T21:34:17Z

Thank you @Urgau . I am please to report that once I installed the try-built toolchain and rebuilt cargo locally, the locally-built cargo was able to build multiple projects without error, with RUST_BACKTRACE=1 .

bors · 2025-01-12T06:21:42Z

💔 Test failed - checks-actions

Urgau · 2025-01-12T11:07:00Z

Seems like you also need to update those lines,

rust/src/ci/docker/host-x86_64/dist-various-2/Dockerfile

Lines 59 to 61 in 13f3924

    
           AR_i686_unknown_freebsd=i686-unknown-freebsd12-ar \ 
        
           CC_i686_unknown_freebsd=i686-unknown-freebsd12-clang \ 
        
           CXX_i686_unknown_freebsd=i686-unknown-freebsd12-clang++ \

Urgau · 2025-01-13T06:41:35Z

@bors try

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc `@ehuss` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

bors · 2025-01-13T06:42:55Z

⌛ Trying commit 0454d79 with merge 2a791fe...

bors · 2025-01-13T08:08:42Z

☀️ Try build successful - checks-actions
Build commit: 2a791fe (2a791fe20bd8ecbbced38bff4be73976a7bcc14c)

Mark-Simulacrum · 2025-01-20T15:47:05Z

@bors r+

bors · 2025-01-20T15:47:08Z

📌 Commit 0454d79 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc `@ehuss` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc ``@ehuss`` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc ```@ehuss``` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

Rollup of 10 pull requests Successful merges: - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4) - rust-lang#135625 ([cfg_match] Document the use of expressions.) - rust-lang#135638 (Make it possible to build GCC on CI) - rust-lang#135648 (support wasm inline assembly in `naked_asm!`) - rust-lang#135707 (Shorten linker output even more when `--verbose` is not present) - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication) - rust-lang#135779 (CI: free disk on linux arm runner) - rust-lang#135793 (Ignore `mermaid.min.js`) - rust-lang#135810 (Add Kobzol on vacation) - rust-lang#135814 (ci: use ghcr buildkit image) r? `@ghost` `@rustbot` modify labels: rollup

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc ````@ehuss```` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4) - rust-lang#135625 ([cfg_match] Document the use of expressions.) - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication) - rust-lang#135793 (Ignore `mermaid.min.js`) - rust-lang#135810 (Add Kobzol on vacation) - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors) - rust-lang#135821 (fix OsString::from_encoded_bytes_unchecked description) r? `@ghost` `@rustbot` modify labels: rollup

CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc `````@ehuss````` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#132232 (CI: build FreeBSD artifacts on FreeBSD 13.4) - rust-lang#135706 (Move `supertrait_def_ids` into the elaborate module like all other fns) - rust-lang#135750 (Add an example of using `carrying_mul_add` to write wider multiplication) - rust-lang#135793 (Ignore `mermaid.min.js`) - rust-lang#135810 (Add Kobzol on vacation) - rust-lang#135821 (fix OsString::from_encoded_bytes_unchecked description) - rust-lang#135824 (tests: delete `cat-and-grep-sanity-check`) - rust-lang#135833 (Add fixme and test for issue rust-lang#135289) Failed merges: - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132232 - asomers:fbsd-13.4, r=Mark-Simulacrum CI: build FreeBSD artifacts on FreeBSD 13.4 13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185 cc ``````@ehuss`````` . before you can do the trybuild, you'll also have to download new FreeBSD 13.4 base.txz images and place them in https://ci-mirrors.rust-lang.org/rustc , then update this PR with the correct file names. try-job: dist-x86_64-freebsd try-job: dist-various-2

rustbot assigned GuillaumeGomez Oct 27, 2024

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 Oct 27, 2024

Urgau reviewed Oct 27, 2024

View reviewed changes

src/ci/docker/scripts/freebsd-toolchain.sh Outdated Show resolved Hide resolved

asomers force-pushed the fbsd-13.4 branch from 4cc1d75 to fbb185e Compare October 28, 2024 12:54

asomers force-pushed the fbsd-13.4 branch from fbb185e to 4c9126d Compare October 28, 2024 13:35

This comment has been minimized.

Sign in to view

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 28, 2024

CI: build FreeBSD artifacts on FreeBSD 13.4

cf34545

13.2 is EoL, and 13.3 will be EoL too in about 2 months. Plus, both suffer from a bug in LLVM's libunwind. It causes a segfault inside of std::backtrace::Backtrace::capture(). Fixes rust-lang#132185

asomers force-pushed the fbsd-13.4 branch from 4c9126d to cf34545 Compare October 28, 2024 14:58

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 12, 2025

Fixup: fix clang command lines in another file

0454d79

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 Jan 20, 2025

jhpratt mentioned this pull request Jan 21, 2025

Rollup of 5 pull requests #135803

Closed

jieyouxu mentioned this pull request Jan 21, 2025

Rollup of 10 pull requests #135820

Closed

jieyouxu mentioned this pull request Jan 21, 2025

Rollup of 10 pull requests #135825

Closed

matthiaskrgr mentioned this pull request Jan 21, 2025

Rollup of 7 pull requests #135835

Closed

This was referenced Jan 21, 2025

Rollup of 6 pull requests #135839

Closed

Rollup of 8 pull requests #135848

Merged

bors merged commit ea594c6 into rust-lang:master Jan 22, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 22, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CI: build FreeBSD artifacts on FreeBSD 13.4 #132232

CI: build FreeBSD artifacts on FreeBSD 13.4 #132232

asomers commented Oct 27, 2024 •

edited by Urgau

Loading

rustbot commented Oct 27, 2024

asomers commented Oct 28, 2024

ehuss commented Oct 28, 2024

bors commented Oct 28, 2024

ehuss commented Oct 28, 2024

asomers commented Oct 28, 2024

Mark-Simulacrum commented Oct 28, 2024

bors commented Oct 28, 2024

This comment has been minimized.

bors commented Oct 28, 2024

asomers commented Oct 28, 2024

ehuss commented Oct 28, 2024

bors commented Oct 28, 2024

bors commented Oct 28, 2024

asomers commented Oct 28, 2024

Urgau commented Oct 28, 2024

asomers commented Oct 28, 2024

bors commented Jan 12, 2025

Urgau commented Jan 12, 2025

Urgau commented Jan 13, 2025

bors commented Jan 13, 2025

bors commented Jan 13, 2025

Mark-Simulacrum commented Jan 20, 2025

bors commented Jan 20, 2025

CI: build FreeBSD artifacts on FreeBSD 13.4 #132232

CI: build FreeBSD artifacts on FreeBSD 13.4 #132232

Conversation

asomers commented Oct 27, 2024 • edited by Urgau Loading

rustbot commented Oct 27, 2024

asomers commented Oct 28, 2024

ehuss commented Oct 28, 2024

bors commented Oct 28, 2024

ehuss commented Oct 28, 2024

asomers commented Oct 28, 2024

Mark-Simulacrum commented Oct 28, 2024

bors commented Oct 28, 2024

This comment has been minimized.

bors commented Oct 28, 2024

asomers commented Oct 28, 2024

ehuss commented Oct 28, 2024

bors commented Oct 28, 2024

bors commented Oct 28, 2024

asomers commented Oct 28, 2024

Urgau commented Oct 28, 2024

asomers commented Oct 28, 2024

bors commented Jan 12, 2025

Urgau commented Jan 12, 2025

Urgau commented Jan 13, 2025

bors commented Jan 13, 2025

bors commented Jan 13, 2025

Mark-Simulacrum commented Jan 20, 2025

bors commented Jan 20, 2025

asomers commented Oct 27, 2024 •

edited by Urgau

Loading