Ruby 3.1 #429
Merged
Ruby 3.1 #429
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The latest epel8/9 has qpid_proton 0.37.0+ that works with ruby 3.1. Part of ManageIQ/manageiq#22696
This was referenced Dec 18, 2023
We control the creation of the sti loader yaml file and the intention of this file is to contain the file paths and constants defined in them so it is expected to contain constants not previously permitted.
jrafanie
commented
Jan 3, 2024
| @@ -104,7 +104,7 @@ def plugin_paths | |||
|
|
|||
| def fixup_sti_loader! | |||
| sti_loader_yml_path = miq_dir.join("tmp/cache/sti_loader.yml") | |||
| sti_loader = YAML.load_file(sti_loader_yml_path) | |||
| sti_loader = YAML.unsafe_load(File.read(sti_loader_yml_path)) | |||
There was a problem hiding this comment.
note, unsafe_load_file didn't exist in all versions of psych so I use the more verbose but backward compatible code.
Fryguy
reviewed
Jan 3, 2024
| @@ -49,7 +49,6 @@ rpm_repository: | |||
| :python-pylxca: !ruby/regexp /.+-2\.1\.1.+/ | |||
| :python-unittest2: !ruby/regexp /.+-1\.1\.0.+/ | |||
| :python-vspk: !ruby/regexp /.+-5\.3\.2.+/ | |||
| :qpid-proton: !ruby/regexp /.+-0\.30\.0.+/ | |||
There was a problem hiding this comment.
do we intend to backport this to quinteros? (I don't think we wanted to, but just checking)
There was a problem hiding this comment.
We haven't decided if we're shipping 3.1 now or later. It's still TBD.
Fryguy
reviewed
Jan 3, 2024
rpm_spec/subpackages/manageiq-gemset
Outdated
| @@ -30,7 +30,7 @@ Requires: python3-pylxca | |||
| Requires: cyrus-sasl | |||
| Requires: cyrus-sasl-plain | |||
| Requires: python3-vspk | |||
| Requires: qpid-proton-c | |||
| Requires: qpid-proton-c >= 0.37.0 | |||
There was a problem hiding this comment.
Suggested change
| Requires: qpid-proton-c >= 0.37.0 | |
| Requires: qpid-proton-c >= 0.37.0 |
We'll need to drop the dnf epel exclude since it previously excluded qpid-proton. Therefore, users will either need to run this manually or we'll provide a script that will do it: ``` dnf config-manager --setopt=epel.exclude= --save ``` See the discussion in ManageIQ/manageiq-appliance-build#559 (comment)
|
Checked commits jrafanie/manageiq-rpm_build@e3b63b6~...868ddf7 with ruby 2.7.8, rubocop 1.56.3, haml-lint 0.51.0, and yamllint **
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Start the switch to ruby 3.1.
Part of ManageIQ/manageiq#22696
I was able to get this working on mac with colima:
bin/build_container_imagedocker run -v /tmp/options:/root/OPTIONS:z manageiq/rpm_build:latest build --build-type nightlyI modified the options.yml locally to build and use this PR via the options.yml:
ManageIQ/manageiq#22808. That PR temporarily included the qpid proton bump from ManageIQ/manageiq#22271.