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

Ruby 3.1 #429

Merged
merged 4 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
ruby-version:
- '3.0'
- '3.1'
steps:
- uses: actions/checkout@v4
- name: Set up Ruby
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ RUN ARCH=$(uname -m) && \
dnf -y install \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
https://rpm.manageiq.org/release/18-radjabov/el8/noarch/manageiq-release-18.0-1.el8.noarch.rpm && \
dnf -y module enable ruby:3.0 && \
dnf -y module enable ruby:3.1 && \
dnf -y module enable nodejs:18 && \
dnf -y module disable virt:rhel && \
if [ ${ARCH} != "s390x" ] ; then dnf config-manager --setopt=ubi-8-*.exclude=rpm* --save; fi && \
dnf -y group install "development tools" && \
dnf config-manager --setopt=epel.exclude=*qpid-proton* --setopt=tsflags=nodocs --save && \
dnf config-manager --setopt=tsflags=nodocs --save && \
dnf -y install \
cmake \
copr-cli \
Expand Down
1 change: 0 additions & 1 deletion config/options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.+/
Copy link
Member

Choose a reason for hiding this comment

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

do we intend to backport this to quinteros? (I don't think we wanted to, but just checking)

Copy link
Member Author

@jrafanie jrafanie Jan 3, 2024

Choose a reason for hiding this comment

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

We haven't decided if we're shipping 3.1 now or later. It's still TBD.

:repmgr13: !ruby/regexp /.+-5\.2\.1.+/
:wmi: !ruby/regexp /.+-1\.3\.14.+/
:18-radjabov-nightly:
Expand Down
3 changes: 0 additions & 3 deletions lib/manageiq/rpm_build/extra_package.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ class MockConfig
:mock_extras => "--enable-network",
:os => "centos-stream+epel",
},
"qpid-proton" => {
:os => "centos-stream+epel",
},
"repmgr13" => {
:mock_extras => "--config-opts=module_setup_commands.module_install=postgresql:13",
:os => "centos-stream+epel",
Expand Down
2 changes: 1 addition & 1 deletion lib/manageiq/rpm_build/generate_core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Copy link
Member Author

Choose a reason for hiding this comment

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

note, unsafe_load_file didn't exist in all versions of psych so I use the more verbose but backward compatible code.


# Replace paths from the rpm build with the paths that will exist at runtime
sti_loader.transform_keys! do |path|
Expand Down
15 changes: 0 additions & 15 deletions packages/qpid-proton/licenses.xml

This file was deleted.

421 changes: 0 additions & 421 deletions packages/qpid-proton/proton.patch

This file was deleted.

Loading