Switch script interpreters to Ruby 3.1

Also make clear that the we require a Ruby ABI version, not an interpreter version.
openSUSE · Mar 15, 2022 · ca628e9 · ca628e9
1 parent 4d078f9
commit ca628e9
Show file tree

Hide file tree

Showing 25 changed files with 33 additions and 33 deletions.
diff --git a/Makefile.include b/Makefile.include
@@ -12,7 +12,7 @@ APACHE_CONFDIR_VHOST=$(APACHE_CONFDIR)/vhosts.d
 APACHE_VHOST_CONF=obs-apache24.conf
 APACHE_LOGDIR=/var/log/apache2
 
-OBS_RUBY_BIN=/usr/bin/ruby.ruby2.5
-OBS_BUNDLE_BIN=/usr/bin/bundle.ruby2.5
-OBS_RAKE_BIN=/usr/bin/rake.ruby2.5
-OBS_RUBY_VERSION=2.5.0
+OBS_RUBY_BIN=/usr/bin/ruby.ruby3.1
+OBS_BUNDLE_BIN=/usr/bin/bundle.ruby3.1
+OBS_RAKE_BIN=/usr/bin/rake.ruby3.1
+OBS_RUBY_ABI_VERSION=3.1.0
diff --git a/dist/Makefile b/dist/Makefile
@@ -33,7 +33,7 @@ install_systemd_services: system_dirs
 	$(foreach service,$(SYSTEMD_SERVICE_FILES) $(SYSTEMD_SERVICE_FILES_WITHOUT_LINK),$(shell $(INSTALL) -m 644 ./systemd/$(service).service $(DESTDIR)$(UNITDIR)$(service).service) )
 	sed -i \
 	  -e 's,@@OBS_BUNDLE_BIN@@,$(OBS_BUNDLE_BIN),' \
-	  -e 's,@@OBS_RUBY_VERSION@@,$(OBS_RUBY_VERSION),' \
+	  -e 's,@@OBS_RUBY_ABI_VERSION@@,$(OBS_RUBY_ABI_VERSION),' \
 	  -e 's,@@APACHE_USER@@,$(APACHE_USER),' \
 	  -e 's,@@APACHE_GROUP@@,$(APACHE_GROUP),' \
 	  -e 's,@@OBS_API_PREFIX@@,$(OBS_API_PREFIX),' \

diff --git a/dist/functions.setup-appliance.sh b/dist/functions.setup-appliance.sh
@@ -538,7 +538,7 @@ function prepare_apache2 {
 function prepare_passenger {
 
   perl -p -i -e \
-    's#^(\s*)PassengerRuby "/usr/bin/ruby"#$1\PassengerRuby "/usr/bin/ruby.ruby2.5"#' \
+    's#^(\s*)PassengerRuby "/usr/bin/ruby"#$1\PassengerRuby "/usr/bin/ruby.ruby3.1"#' \
       $MOD_PASSENGER_CONF
 
 }

diff --git a/dist/obs-server.spec b/dist/obs-server.spec
@@ -38,7 +38,7 @@ Requires:       ruby\
 Requires:       rubygem-rails\
 %{nil}
 
-%define __obs_ruby_version 2.6.0
+%define __obs_ruby_abi_version 2.6.0
 %define __obs_ruby_bin /usr/bin/ruby
 %define __obs_bundle_bin /usr/bin/bundle
 %define __obs_rake_bin /usr/bin/rake
@@ -62,10 +62,10 @@ Requires:       apache2\
 Requires:       apache2-mod_xforward\
 Requires:       %{rubygem passenger}\
 Requires:       rubygem-passenger-apache2\
-Requires:       ruby(abi) = %{__obs_ruby_version}\
+Requires:       ruby(abi) = %{__obs_ruby_abi_version}\
 %{nil}
 
-%define __obs_ruby_version 3.1.1
+%define __obs_ruby_abi_version 3.1.0
 %define __obs_ruby_bin /usr/bin/ruby.ruby3.1
 %define __obs_bundle_bin /usr/bin/bundle.ruby3.1
 %define __obs_rake_bin /usr/bin/rake.ruby3.1
@@ -459,7 +459,7 @@ APACHE_LOGDIR=%{apache_logdir}
 OBS_RUBY_BIN=%{__obs_ruby_bin}
 OBS_BUNDLE_BIN=%{__obs_bundle_bin}
 OBS_RAKE_BIN=%{__obs_rake_bin}
-OBS_RUBY_VERSION=%{__obs_ruby_version}
+OBS_RUBY_ABI_VERSION=%{__obs_ruby_abi_version}
 EOF
 
 pushd src/api

diff --git a/dist/systemd/obs-clockwork.service b/dist/systemd/obs-clockwork.service
@@ -8,8 +8,8 @@ Environment = "RAILS_ENV=production"
 User = @@APACHE_USER@@
 Group = @@APACHE_GROUP@@
 WorkingDirectory = @@OBS_API_PREFIX@@
-ExecStart = @@OBS_BUNDLE_BIN@@ exec /usr/lib64/obs-api/ruby/@@OBS_RUBY_VERSION@@/bin/clockworkd --log-dir=log -l -c config/clock.rb start
-ExecStop = @@OBS_BUNDLE_BIN@@ exec /usr/lib64/obs-api/ruby/@@OBS_RUBY_VERSION@@/bin/clockworkd -l -c config/clock.rb stop
+ExecStart = @@OBS_BUNDLE_BIN@@ exec /usr/lib64/obs-api/ruby/@@OBS_RUBY_ABI_VERSION@@/bin/clockworkd --log-dir=log -l -c config/clock.rb start
+ExecStop = @@OBS_BUNDLE_BIN@@ exec /usr/lib64/obs-api/ruby/@@OBS_RUBY_ABI_VERSION@@/bin/clockworkd -l -c config/clock.rb stop
 Type = forking
 PIDFile = @@OBS_API_PREFIX@@/tmp/clockworkd.clock.pid
 

diff --git a/docs/api/Makefile b/docs/api/Makefile
@@ -2,7 +2,7 @@ include ../../Makefile.include
 -include ../../Makefile.local
 
 apidocs:
-	sed -i -e 's,#!/usr/bin/ruby.ruby2.5,#!$(OBS_RUBY_BIN),' ./restility/bin/rest_doc ./restility/bin/rest_test
+	sed -i -e 's,#!/usr/bin/ruby.ruby3.1,#!$(OBS_RUBY_BIN),' ./restility/bin/rest_doc ./restility/bin/rest_test
 	cd api; make apidocs
 
 doc: apidocs

diff --git a/docs/api/api/Makefile b/docs/api/api/Makefile
@@ -8,7 +8,7 @@ test:
 	../restility/bin/rest_test api.txt
 
 apidocs:
-	sed -i -e 's,#!/usr/bin/ruby.ruby2.5,#!$(OBS_RUBY_BIN),' ../restility/bin/rest_test ../restility/bin/rest_doc
+	sed -i -e 's,#!/usr/bin/ruby.ruby3.1,#!$(OBS_RUBY_BIN),' ../restility/bin/rest_test ../restility/bin/rest_doc
 	BUNDLE_GEMFILE=../../../src/api/Gemfile bundle exec ../restility/bin/rest_doc api.txt --html -o ../html
 
 .PHONY: all test apidocs

diff --git a/docs/api/restility/bin/rest_doc b/docs/api/restility/bin/rest_doc
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 
 require 'optparse'
 require 'rubygems'

diff --git a/docs/api/restility/bin/rest_test b/docs/api/restility/bin/rest_test
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 
 require 'optparse'
 require 'rubygems'

diff --git a/src/api/Makefile b/src/api/Makefile
@@ -23,8 +23,8 @@ prepare_rake: prepare_dirs
 	rm $(DESTDIR)$(OBS_API_PREFIX)/Procfile
 	touch $(DESTDIR)$(OBS_API_PREFIX)/log/production.log
 	touch $(DESTDIR)$(OBS_API_PREFIX)/config/production.sphinx.conf
-	sed -i -e 's,#!/usr/bin/ruby.ruby2.5,#!$(OBS_RUBY_BIN),' $(DESTDIR)$(OBS_API_PREFIX)/bin/* $(DESTDIR)$(OBS_API_PREFIX)/script/*
-	sed -i -e 's,#!/usr/bin/rake.ruby2.5,#!$(OBS_RAKE_BIN),' $(DESTDIR)$(OBS_API_PREFIX)/Rakefile
+	sed -i -e 's,#!/usr/bin/ruby.ruby3.1,#!$(OBS_RUBY_BIN),' $(DESTDIR)$(OBS_API_PREFIX)/bin/* $(DESTDIR)$(OBS_API_PREFIX)/script/*
+	sed -i -e 's,#!/usr/bin/rake.ruby3.1,#!$(OBS_RAKE_BIN),' $(DESTDIR)$(OBS_API_PREFIX)/Rakefile
 
 
 docs:

diff --git a/src/api/Rakefile b/src/api/Rakefile
@@ -1,4 +1,4 @@
-#!/usr/bin/rake.ruby2.5
+#!/usr/bin/rake.ruby3.1
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/something.rake, and they will automatically be available to Rake.
 

diff --git a/src/api/bin/bundle b/src/api/bin/bundle
@@ -1,3 +1,3 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')
diff --git a/src/api/bin/pry b/src/api/bin/pry
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 # frozen_string_literal: true
 
 #

diff --git a/src/api/bin/rails b/src/api/bin/rails
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative "../config/boot"
 require "rails/commands"
diff --git a/src/api/bin/rake b/src/api/bin/rake
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 require_relative "../config/boot"
 require "rake"
 Rake.application.run
diff --git a/src/api/bin/rdoc b/src/api/bin/rdoc
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 # frozen_string_literal: true
 
 #

diff --git a/src/api/bin/ri b/src/api/bin/ri
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 # frozen_string_literal: true
 
 #

diff --git a/src/api/bin/rspec b/src/api/bin/rspec
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 # frozen_string_literal: true
 
 #

diff --git a/src/api/bin/rubocop b/src/api/bin/rubocop
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 # frozen_string_literal: true
 
 #

diff --git a/src/api/bin/setup b/src/api/bin/setup
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 require "fileutils"
 
 # path to your application root.

diff --git a/src/api/script/delayed_job.api.rb b/src/api/script/delayed_job.api.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
 require 'delayed/command'

diff --git a/src/api/script/plugin b/src/api/script/plugin
@@ -1,3 +1,3 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 require File.dirname(__FILE__) + '/../config/boot'
 require 'commands/plugin'
diff --git a/src/api/script/reformat_memprof b/src/api/script/reformat_memprof
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 
 require 'rubygems'
 require 'json'

diff --git a/src/api/script/rubygem_package_names.rb b/src/api/script/rubygem_package_names.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 
 require 'bundler'
 

diff --git a/src/api/script/start_test_backend b/src/api/script/start_test_backend
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby.ruby2.5
+#!/usr/bin/ruby.ruby3.1
 ENV['RAILS_ENV'] ||= 'test'
 ENV['origin_RAILS_ENV'] ||= ENV['RAILS_ENV']
 ENV['LC_ALL'] = 'C'