From 99585774896fd33ec812acc9eb9dada7d99f5f23 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 20 Apr 2018 15:34:50 +0200 Subject: [PATCH 1/7] Update to pin Ruby 2.5 Signed-off-by: Jun Aruga --- ruby.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 3f83716..626331b 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -30,7 +30,8 @@ data: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language buildorder: 101 - ref: master + # Set a reference on master to guarantee the Ruby version 2.5. + ref: ecbc53b rubygem-abrt: # From rubygem-abrt.spec Summary rationale: >- From 01aa43d796aa0cf35d9d1075444e1a0d572481bd Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 10 Apr 2019 15:44:17 +0200 Subject: [PATCH 2/7] Backport from master branch. * ruby.yaml version is now 2. * Set multilib: [x86_64]. --- ruby.yaml | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 626331b..9a09aae 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -1,7 +1,5 @@ -# Keep a generated ruby.yaml file URL here to follow latest configuration. -# https://github.com/fedora-modularity/dependency-report/blob/master/modules/ruby/ruby.yaml document: modulemd -version: 1 +version: 2 data: # From ruby.spec Summary summary: An interpreter of object-oriented scripting language @@ -19,19 +17,22 @@ data: documentation: https://www.ruby-lang.org/en/documentation/ tracker: https://bugs.ruby-lang.org/ dependencies: - buildrequires: - platform: f28 - requires: - platform: f28 + - buildrequires: + # platform: [] is recommended. + # But set "-f28" to avoid the build failure as a temporary workflow. + platform: [-f28] + requires: + platform: [-f28] components: # SRPMs rpms: ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language + multilib: [x86_64] buildorder: 101 # Set a reference on master to guarantee the Ruby version 2.5. - ref: ecbc53b + ref: bb26a28 rubygem-abrt: # From rubygem-abrt.spec Summary rationale: >- @@ -72,19 +73,15 @@ data: buildopts: rpms: macros: | - %_without_rubypick 1 - %_without_systemtap 1 - %_without_git 1 - %_without_cmake 1 + # To disable tests in several packages. + %_without_tests 1 api: # RPMs # From *.spec %package - # *-doc are filtered. rpms: # From ruby.spec - ruby - ruby-devel - # - ruby-doc - ruby-irb - ruby-libs - rubygems @@ -104,32 +101,16 @@ data: - rubygem-xmlrpc # From rubygem-abrt.spec - rubygem-abrt - # - rubygem-abrt-doc # From rubygem-bundler.spec - rubygem-bundler - # - rubygem-bundler-doc # From rubygem-mysql2.spec - rubygem-mysql2 - # - rubygem-mysql2-doc # From rubygem-pg.spec - rubygem-pg - # - rubygem-pg-doc # From rubygem-bson.spec - rubygem-bson - # - rubygem-bson-doc # From rubygem-mongo.spec - rubygem-mongo - # - rubygem-mongo-doc - filter: - # RPMs - rpms: - - ruby-doc - - rubygem-abrt-doc - - rubygem-bundler-doc - - rubygem-mysql2-doc - - rubygem-pg-doc - - rubygem-bson-doc - - rubygem-mongo-doc # Add profiles/default as a temporary workflow, # because of a issue for omitted profiles element. profiles: From a80e2a7398e595421fcb75e933d59c88085a08f8 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 30 Apr 2019 18:38:37 +0200 Subject: [PATCH 3/7] Build referring ruby-2.5 branch. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 9a09aae..6eb9b97 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -32,7 +32,7 @@ data: multilib: [x86_64] buildorder: 101 # Set a reference on master to guarantee the Ruby version 2.5. - ref: bb26a28 + ref: ruby-2.5 rubygem-abrt: # From rubygem-abrt.spec Summary rationale: >- From 448302253af0d9d5257931bbda9e389260f6929e Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 2 May 2019 15:46:57 +0200 Subject: [PATCH 4/7] Set "-f29" temporarily to avoid build issue. https://bugzilla.redhat.com/show_bug.cgi?id=1705543 --- ruby.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 6eb9b97..fb62dc3 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -20,9 +20,11 @@ data: - buildrequires: # platform: [] is recommended. # But set "-f28" to avoid the build failure as a temporary workflow. - platform: [-f28] + # Set "-f29" temporarily to avoid below issue. + # https://bugzilla.redhat.com/show_bug.cgi?id=1705543 + platform: [-f28, -f29] requires: - platform: [-f28] + platform: [-f28, -f29] components: # SRPMs rpms: From 103d051a9ccda92f6b2612021eae7004e15f40e2 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 14 May 2019 15:56:54 +0200 Subject: [PATCH 5/7] Add f29 again as the zlib-devel issue was fixed. --- ruby.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index fb62dc3..6eb9b97 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -20,11 +20,9 @@ data: - buildrequires: # platform: [] is recommended. # But set "-f28" to avoid the build failure as a temporary workflow. - # Set "-f29" temporarily to avoid below issue. - # https://bugzilla.redhat.com/show_bug.cgi?id=1705543 - platform: [-f28, -f29] + platform: [-f28] requires: - platform: [-f28, -f29] + platform: [-f28] components: # SRPMs rpms: From 9fc1507458073af6385ea4eb96eccf353b36f094 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 12 Aug 2020 18:29:48 +0200 Subject: [PATCH 6/7] Update macros. * Remove %_without_hardening_test as f30 was removed from the buildroot. * Add %test_timeout_scale to improve unstable tests by timeout in ruby. --- ruby.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 6eb9b97..1bfb38d 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -19,10 +19,9 @@ data: dependencies: - buildrequires: # platform: [] is recommended. - # But set "-f28" to avoid the build failure as a temporary workflow. - platform: [-f28] + platform: [-el8] requires: - platform: [-f28] + platform: [-el8] components: # SRPMs rpms: @@ -75,6 +74,8 @@ data: macros: | # To disable tests in several packages. %_without_tests 1 + # To avoid the test faiures by timeout in ruby. + %test_timeout_scale 6 api: # RPMs # From *.spec %package From 9b2be25d63fc82474da8344fd55fb40beec7d286 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 27 Oct 2020 15:32:41 +0100 Subject: [PATCH 7/7] Empty commit to update the built RPM packages to latest verson.