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

Revert "Bump rust version" #479

Merged
merged 1 commit into from
Nov 4, 2024

Conversation

Earlopain
Copy link
Contributor

This reverts commit 89946d9, reversing changes made to 7cb059d.

I chose an inopportune time to do this.

There is an upstream issue where builds on arm64/v8 fail: https://bugs.ruby-lang.org/issues/20506

Example failure: https://doi-janky.infosiftr.net/job/wip/job/new/job/build-arm64v8/45573/console

I believe rust-lang/rust#131221 will fix this but it is only slated for Rust 1.83

@Earlopain
Copy link
Contributor Author

Earlopain commented Nov 3, 2024

Some corrections: This is alpine-only and the PR I linked seems to not be that relevant. I did a build with nightly and the build error still occurs. The PR in LLVM (llvm/llvm-project#93890) has not been backported as far as I can tell.

@Earlopain
Copy link
Contributor Author

I'll try this again next year or so, after 2-3 rust releases. Per the ruby issue, should be a good chance it will work correctly everywhere then. Looks like the missing backport was the culprit after all.

@yosifkit
Copy link
Member

yosifkit commented Nov 4, 2024

Thanks!

@tianon
Copy link
Member

tianon commented Nov 4, 2024

This should be a revert of e76791f, not the merge commit, right? (doing it that way makes the changes/history easier to track)

This reverts commit e76791f.

I chose an inopportune time to do this.

There is an upstream issue where builds on alpine arm64/v8 fail:
https://bugs.ruby-lang.org/issues/20506

Example failure: https://doi-janky.infosiftr.net/job/wip/job/new/job/build-arm64v8/45573/console

I believe rust-lang/rust#131221 will fix this
but it is only slated for Rust 1.83
@Earlopain Earlopain changed the title Revert "Merge pull request #478 from Earlopain/bump-rust" @Earlopain Revert "Bump rust version" Nov 4, 2024
@Earlopain Earlopain changed the title @Earlopain Revert "Bump rust version" Revert "Bump rust version" Nov 4, 2024
@Earlopain
Copy link
Contributor Author

I don't think there is much difference execpt for the generated commit message? I switched it over, not very familiar with git reverting.

Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice, thank you! ❤️

@tianon tianon merged commit 6bb29d9 into docker-library:master Nov 4, 2024
26 checks passed
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Nov 5, 2024
Changes:

- docker-library/ruby@6bb29d9: Merge pull request docker-library/ruby#479 from Earlopain/revert-rust-bump
- docker-library/ruby@f268d39: Revert "Bump rust version"
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Nov 5, 2024
Changes:

- docker-library/ruby@b511945: Update 3.3 to 3.3.6
- docker-library/ruby@6bb29d9: Merge pull request docker-library/ruby#479 from Earlopain/revert-rust-bump
- docker-library/ruby@f268d39: Revert "Bump rust version"
@Earlopain Earlopain deleted the revert-rust-bump branch November 5, 2024 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants