Skip to content

Commit 9f9a42c

Browse files
authored
Merge pull request #10 from yast/Ruby-3.2
Update to Ruby 3.2
2 parents c0b723d + 8489b3c commit 9f9a42c

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

package/Dockerfile

+15-8
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ RUN zypper --non-interactive install --no-recommends \
4141
openSUSE-release-ftp \
4242
rpm-build \
4343
ruby-devel \
44-
"rubygem(ruby:3.1.0:fast_gettext)" \
45-
"rubygem(ruby:3.1.0:gettext)" \
46-
"rubygem(ruby:3.1.0:raspell)" \
47-
"rubygem(ruby:3.1.0:rspec)" \
48-
"rubygem(ruby:3.1.0:rubocop)" \
49-
"rubygem(ruby:3.1.0:simplecov)" \
50-
"rubygem(ruby:3.1.0:yard)" \
51-
"rubygem(ruby:3.1.0:yast-rake)" \
44+
"rubygem(ruby:3.2.0:fast_gettext)" \
45+
"rubygem(ruby:3.2.0:gettext)" \
46+
"rubygem(ruby:3.2.0:raspell)" \
47+
"rubygem(ruby:3.2.0:rspec)" \
48+
"rubygem(ruby:3.2.0:rubocop)" \
49+
"rubygem(ruby:3.2.0:simplecov)" \
50+
"rubygem(ruby:3.2.0:yard)" \
51+
"rubygem(ruby:3.2.0:yast-rake)" \
5252
screen \
5353
sgml-skel \
5454
ShellCheck \
@@ -64,6 +64,13 @@ RUN zypper --non-interactive install --no-recommends \
6464
&& find /usr/lib/locale/* -maxdepth 1 | grep -v -E "(en_US|cs_CZ|es_ES|de_DE|C.utf8)" | xargs rm -rf \
6565
&& find /usr/share/locale -name "*.mo" -delete
6666

67+
# fail when there are multiple Ruby interpreters installed
68+
# Because it means one part of YaST wanted a different version than the other
69+
# and requires/imports will fail on the version mismatch.
70+
RUN if [ `rpm -q --whatprovides "ruby(abi)" | wc -l` -gt 1 ]; then \
71+
rpm -q --whatprovides "ruby(abi)"; \
72+
echo "Multiple Rubies detected, most likely the system Ruby version has been upgraded."; \
73+
echo "Update the versions of the included Ruby gems."; exit 1; fi
6774

6875
COPY yast-ci-cpp /usr/local/bin/
6976
RUN chmod a+x /usr/local/bin/yast-ci-cpp

0 commit comments

Comments
 (0)