Skip to content

ci: Update FreeBSD and illumos binutils to 2.40 #113986

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
Merged
merged 1 commit into from
Aug 23, 2023
Merged

ci: Update FreeBSD and illumos binutils to 2.40 #113986

merged 1 commit into from
Aug 23, 2023

Conversation

MaskRay
Copy link
Contributor

@MaskRay MaskRay commented Jul 23, 2023 •
edited
Loading

The current old 2.25 seems to cause trouble to #106511.

Install texinfo to dist-x86_64-freebsd/Dockerfile like other containers
to fix

  MAKEINFO doc/bfd.info
/binutils/binutils-2.40/missing: 81: /binutils/binutils-2.40/missing: makeinfo: not found
WARNING: 'makeinfo' is missing on your system.

https://www.freshports.org/devel/binutils uses 2.40 for FreeBSD 12.x as well.

@nikic

@rustbot
Copy link
Collaborator

rustbot commented Jul 23, 2023

r? @Mark-Simulacrum

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

@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 Jul 23, 2023
@MaskRay MaskRay changed the title ci: Update FreeBSD binutils to 2.40 ci: Update FreeBSD and illumos binutils to 2.40 Jul 23, 2023
@MaskRay MaskRay mentioned this pull request Jul 23, 2023
Merged
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

Approving since it looks like we're not documenting the version used here on platform support (so bumping should be OK). But, we can revert if folks disagree and ideally document as part of that.

@bors
Copy link
Collaborator

bors commented Aug 6, 2023

📌 Commit c034d81d59d9fb2409cbde7b031bbbff142f87f3 has been approved by Mark-Simulacrum

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 Aug 6, 2023
@bors
Copy link
Collaborator

bors commented Aug 7, 2023

⌛ Testing commit c034d81d59d9fb2409cbde7b031bbbff142f87f3 with merge a4284b104cdf5383b4c308c5f6455b36575a7f33...

@bors
Copy link
Collaborator

bors commented Aug 7, 2023

💔 Test failed - checks-actions

@bors 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 Aug 7, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member

@bors retry

@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 Aug 13, 2023
@bors
Copy link
Collaborator

bors commented Aug 13, 2023

⌛ Testing commit c034d81d59d9fb2409cbde7b031bbbff142f87f3 with merge 2ca38087663938fa4a82c1f457f9d719a296172d...

@bors
Copy link
Collaborator

bors commented Aug 13, 2023

💔 Test failed - checks-actions

@bors 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 Aug 13, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@MaskRay MaskRay force-pushed the freebsd branch 2 times, most recently from 9064b9d to 261084e Compare August 21, 2023 21:02
@nikic
Copy link
Contributor

nikic commented Aug 22, 2023

@bors r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Aug 22, 2023

📌 Commit 261084ed5b13189fb0b88f7ca9866309d8500e51 has been approved by Mark-Simulacrum

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 Aug 22, 2023
@bors
Copy link
Collaborator

bors commented Aug 22, 2023

⌛ Testing commit 261084ed5b13189fb0b88f7ca9866309d8500e51 with merge 227ebf0999222ea55834a82025ff5800c61ea261...

@bors
Copy link
Collaborator

bors commented Aug 22, 2023

💔 Test failed - checks-actions

@bors 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 Aug 22, 2023
@MaskRay
Copy link
Contributor Author

MaskRay commented Aug 22, 2023

I modified illumos but not FreeBSD in the last commit, but https://github.com/rust-lang-ci/rust/actions/runs/5936575091/job/16097426616 (FreeBSD) gave me

Run exit 1
  exit 1
  shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
Error: Process completed with exit code 1.

It looks flaky?

@nikic
Copy link
Contributor

nikic commented Aug 22, 2023

It looks like a legitimate failure:


2023-08-22T08:54:54.2314922Z   MAKEINFO doc/bfd.info
2023-08-22T08:54:54.2315195Z /binutils/binutils-2.40/missing: 81: /binutils/binutils-2.40/missing: makeinfo: not found
2023-08-22T08:54:54.2315370Z WARNING: 'makeinfo' is missing on your system.
2023-08-22T08:54:54.2315589Z          You should only need it if you modified a '.texi' file, or
2023-08-22T08:54:54.2315755Z          any other file indirectly affecting the aspect of the manual.
2023-08-22T08:54:54.2315899Z          You might want to install the Texinfo package:
2023-08-22T08:54:54.2316029Z          <http://www.gnu.org/software/texinfo/>
2023-08-22T08:54:54.2316193Z          The spurious makeinfo call might also be the consequence of
2023-08-22T08:54:54.2316417Z          using a buggy 'make' (AIX, DU, IRIX), in which case you might
2023-08-22T08:54:54.2316517Z          want to install GNU make:
2023-08-22T08:54:54.2316634Z          <http://www.gnu.org/software/make/>
2023-08-22T08:54:54.2316831Z Makefile:1794: recipe for target 'doc/bfd.info' failed
2023-08-22T08:54:54.2316940Z make[3]: *** [doc/bfd.info] Error 127
2023-08-22T08:54:54.2317139Z make[3]: Leaving directory '/binutils/binutils-build/bfd'
2023-08-22T08:54:54.2317339Z Makefile:1955: recipe for target 'info-recursive' failed
2023-08-22T08:54:54.2317486Z make[2]: *** [info-recursive] Error 1
2023-08-22T08:54:54.2317685Z make[2]: Leaving directory '/binutils/binutils-build/bfd'
2023-08-22T08:54:54.2317868Z Makefile:3076: recipe for target 'all-bfd' failed
2023-08-22T08:54:54.2318003Z make[1]: *** [all-bfd] Error 2
2023-08-22T08:54:54.2318121Z make[1]: *** Waiting for unfinished jobs....

@nikic
Copy link
Contributor

nikic commented Aug 22, 2023

You can locally test the container using DEPLOY=1 src/ci/docker/run.sh dist-x86_64-freebsd.

@MaskRay
ci: Update FreeBSD and illumos binutils to 2.40
5ee08a0 
The current old 2.25 seems to cause trouble to rust-lang#106511.

Install texinfo to dist-x86_64-freebsd/Dockerfile like other containers
to fix
```
  MAKEINFO doc/bfd.info
/binutils/binutils-2.40/missing: 81: /binutils/binutils-2.40/missing: makeinfo: not found
WARNING: 'makeinfo' is missing on your system.
```
@MaskRay
Copy link
Contributor Author

MaskRay commented Aug 22, 2023

Thank you. Added this hunk

--- a/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   sudo \
   bzip2 \
   xz-utils \
+  texinfo \
   wget \
   libssl-dev \
   pkg-config \

@nikic
Copy link
Contributor

nikic commented Aug 23, 2023

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Aug 23, 2023

📌 Commit 5ee08a0 has been approved by nikic

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 Aug 23, 2023
@bors
Copy link
Collaborator

bors commented Aug 23, 2023

⌛ Testing commit 5ee08a0 with merge 3475fa7...

@bors
Copy link
Collaborator

bors commented Aug 23, 2023

☀️ Test successful - checks-actions
Approved by: nikic
Pushing 3475fa7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 23, 2023
@bors bors merged commit 3475fa7 into rust-lang:master Aug 23, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 23, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (3475fa7): 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

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

Binary size

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

Bootstrap: 634.811s -> 634.459s (-0.06%)
Artifact size: 347.22 MiB -> 347.21 MiB (-0.00%)

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.74.0
Development

Successfully merging this pull request may close these issues.
7 participants
@MaskRay @rustbot @Mark-Simulacrum @bors @rust-log-analyzer @nikic @rust-timer