From 916b0b413ab4544fca791d054a6f69cf150dd0d2 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 18 Sep 2018 10:56:12 +0200 Subject: [PATCH 01/26] Remove macros to remove systemtap, git and cmake. Because it is better to run the tests for that in rpms/ruby. Last time we could not refer the packages that is not included in platform module. But now we can. --- ruby.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 52d2292..408acd5 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -72,9 +72,6 @@ data: rpms: macros: | %_without_rubypick 1 - %_without_systemtap 1 - %_without_git 1 - %_without_cmake 1 %_without_tests 1 api: # RPMs From 2dee69bf0ed62add719bc999a5ac0c59fe9eab2f Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 25 Sep 2018 13:22:46 +0200 Subject: [PATCH 02/26] Empty commit. From b66ae8c5de9e6c74c504ae623191ba3e4241973a Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 18 Sep 2018 10:56:12 +0200 Subject: [PATCH 03/26] Remove macros to remove systemtap, git and cmake. Because it is better to run the tests for that in rpms/ruby. Last time we could not refer the packages that is not included in platform module. But now we can. --- ruby.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 52d2292..408acd5 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -72,9 +72,6 @@ data: rpms: macros: | %_without_rubypick 1 - %_without_systemtap 1 - %_without_git 1 - %_without_cmake 1 %_without_tests 1 api: # RPMs From 16723c825163b93f75e47242d98123afa596a11d Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 3 Oct 2018 18:19:32 +0200 Subject: [PATCH 04/26] Add multilib for both i686 and x86_64 versions to be installed on x86_64. --- ruby.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby.yaml b/ruby.yaml index 408acd5..907b034 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -29,6 +29,7 @@ data: ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language + multilib: [ x86_64 ] buildorder: 101 ref: master rubygem-abrt: From e3210c173d1a7383a88b07ba8b0dd5cd402de561 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 3 Oct 2018 18:37:15 +0200 Subject: [PATCH 05/26] Refactoring multilib. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index 907b034..d48bdd9 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -29,7 +29,7 @@ data: ruby: # From ruby.spec Summary rationale: An interpreter of object-oriented scripting language - multilib: [ x86_64 ] + multilib: [x86_64] buildorder: 101 ref: master rubygem-abrt: From 9f165149717363aa3b3a8fafb990286f6406140a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 18 Feb 2019 23:01:09 +0000 Subject: [PATCH 06/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering From dd90e5da318500317d8a022c60244b76c4ad0688 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Mar 2019 19:23:03 +0000 Subject: [PATCH 07/26] Branching f30 from rawhide Signed-off-by: Fedora Release Engineering From 2333349e7a25a8c6e718fdff46d8561371199da1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 4 Mar 2019 18:13:48 +0000 Subject: [PATCH 08/26] Branching f30 from rawhide, second attempt after platform:f31 enablement Signed-off-by: Fedora Release Engineering From 2f9338d93daa01c09d1771f5c81e80ecfcfb99c7 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 11 Mar 2019 17:15:31 +0100 Subject: [PATCH 09/26] Empty commit to update the built RPM packages to latest verson. To apply a latest commit to fix rpms/ruby FTBFS. From dd0a7853746cafe9046d5b294ff3ea90555f0d3f Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 13 Mar 2019 16:02:34 +0100 Subject: [PATCH 10/26] Remove "%_without_rubypick 1" to build with same condition of rpms/ruby. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index d48bdd9..dc06763 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -72,7 +72,7 @@ data: buildopts: rpms: macros: | - %_without_rubypick 1 + # To disable tests in several packages. %_without_tests 1 api: # RPMs From 0a871b6a0bfcb48224edd87b98345272418ed4bf Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 3 Apr 2019 16:07:19 +0200 Subject: [PATCH 11/26] Empty commit to update the built RPM packages to latest verson. From f6a9602228354db9196526cb0103ff177198fd06 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 12 Apr 2019 15:02:34 +0200 Subject: [PATCH 12/26] Unsupported. --- .gitignore | 2 - Dockerfile | 16 ------- Makefile | 14 ------ README.md | 9 ---- dead.package | 1 + ruby.yaml | 117 ---------------------------------------------- sources | 0 tests/Makefile | 6 --- tests/config.yaml | 15 ------ 9 files changed, 1 insertion(+), 179 deletions(-) delete mode 100644 .gitignore delete mode 100644 Dockerfile delete mode 100644 Makefile delete mode 100644 README.md create mode 100644 dead.package delete mode 100644 ruby.yaml delete mode 100644 sources delete mode 100644 tests/Makefile delete mode 100644 tests/config.yaml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6a222e9..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.py[oc] -tests/generated.py diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 75809f3..0000000 --- a/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# A workflow with docker is still uncertain. -# Keep watching below file and other module's situation. -# https://github.com/container-images/container-image-template/blob/master/Dockerfile.template -FROM registry.fedoraproject.org/f26-modular/boltron - -WORKDIR /build -COPY . . - -ENV LC_CTYPE C.UTF-8 - -RUN dnf -y update -RUN dnf -y --nodocs install \ - ruby \ - && dnf -y clean all - -CMD /bin/bash diff --git a/Makefile b/Makefile deleted file mode 100644 index cd54e7a..0000000 --- a/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -DOCKER_IMAGE=ruby - -default: test - -build-docker: - docker build -t $(DOCKER_IMAGE) . - -test-nspawn: - MODULE=nspawn $(MAKE) -C tests test - -test-docker: build-docker - MODULE=docker URL=docker=$(DOCKER_IMAGE) $(MAKE) -C tests test - -test: test-nspawn test-docker diff --git a/README.md b/README.md deleted file mode 100644 index ca416cb..0000000 --- a/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# modules/ruby - -## Current status - -This module is not available yet. - -See this Bugzilla ticket to check the status. - -https://bugzilla.redhat.com/show_bug.cgi?id=1490285 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..cfb6fca --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Unsupported diff --git a/ruby.yaml b/ruby.yaml deleted file mode 100644 index 408acd5..0000000 --- a/ruby.yaml +++ /dev/null @@ -1,117 +0,0 @@ -document: modulemd -version: 2 -data: - # From ruby.spec Summary - summary: An interpreter of object-oriented scripting language - # From ruby.spec description - description: >- - Ruby is the interpreted scripting language for quick and easy - object-oriented programming. It has many features to process text - files and to do system management tasks (as in Perl). It is simple, - straight-forward, and extensible. - license: - module: - - MIT - references: - community: http://ruby-lang.org/ - documentation: https://www.ruby-lang.org/en/documentation/ - tracker: https://bugs.ruby-lang.org/ - dependencies: - - 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 - buildorder: 101 - ref: master - rubygem-abrt: - # From rubygem-abrt.spec Summary - rationale: >- - ABRT support for Ruby - buildorder: 102 - ref: master - rubygem-bundler: - # From rubygem-bundler.spec Summary - rationale: >- - Library and utilities to manage a Ruby application's gem - dependencies - buildorder: 102 - ref: master - rubygem-mysql2: - # From rubygem-mysql2.spec Summary - rationale: >- - A simple, fast Mysql library for Ruby, binding to libmysql - buildorder: 102 - ref: master - rubygem-pg: - # From rubygem-pg.spec Summary - rationale: >- - A Ruby interface to the PostgreSQL RDBMS - buildorder: 102 - ref: master - rubygem-bson: - # From rubygem-bson.spec Summary - rationale: >- - Ruby Implementation of the BSON specification - buildorder: 102 - ref: master - rubygem-mongo: - # From rubygem-mongo.spec Summary - rationale: >- - Ruby driver for MongoDB - buildorder: 103 - ref: master - buildopts: - rpms: - macros: | - %_without_rubypick 1 - %_without_tests 1 - api: - # RPMs - # From *.spec %package - rpms: - # From ruby.spec - - ruby - - ruby-devel - - ruby-irb - - ruby-libs - - rubygems - - rubygems-devel - - rubygem-bigdecimal - - rubygem-did_you_mean - - rubygem-io-console - - rubygem-json - - rubygem-minitest - - rubygem-net-telnet - - rubygem-openssl - - rubygem-power_assert - - rubygem-psych - - rubygem-rake - - rubygem-rdoc - - rubygem-test-unit - - rubygem-xmlrpc - # From rubygem-abrt.spec - - rubygem-abrt - # From rubygem-bundler.spec - - rubygem-bundler - # From rubygem-mysql2.spec - - rubygem-mysql2 - # From rubygem-pg.spec - - rubygem-pg - # From rubygem-bson.spec - - rubygem-bson - # From rubygem-mongo.spec - - rubygem-mongo - # Add profiles/default as a temporary workflow, - # because of a issue for omitted profiles element. - profiles: - default: - rpms: - - ruby diff --git a/sources b/sources deleted file mode 100644 index e69de29..0000000 diff --git a/tests/Makefile b/tests/Makefile deleted file mode 100644 index 6683583..0000000 --- a/tests/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Installation -# https://meta-test-family.readthedocs.io/en/latest/installation.html#installing-mtf -test: - mtf-env-set - mtf-generator - mtf -l *.py diff --git a/tests/config.yaml b/tests/config.yaml deleted file mode 100644 index 491e3bf..0000000 --- a/tests/config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -document: modularity-testing -version: 1 -name: ruby -modulemd-url: https://src.fedoraproject.org/cgit/modules/ruby.git/plain/ruby.yaml -packages: - rpms: - - ruby -module: - rpm: - url: http://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/26/Everything/x86_64/os/ - docker: - url: docker.io/centos/ruby-23-centos7 -test: - version: - - 'ruby -v' From 3eb86e85d17424f6a92eb28a740dd2852cd86498 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 2 May 2019 16:03:33 +0200 Subject: [PATCH 13/26] Remove outdated README.md. modules/ruby is available now! --- README.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index ca416cb..0000000 --- a/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# modules/ruby - -## Current status - -This module is not available yet. - -See this Bugzilla ticket to check the status. - -https://bugzilla.redhat.com/show_bug.cgi?id=1490285 From 1e6f5f80fce62b5f7c2b533a8085f2a16973acbb Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 29 May 2019 14:49:03 +0200 Subject: [PATCH 14/26] Remove rubygem-bundler. rubygem-bundler is now included in rpms/ruby. --- ruby.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index dc06763..e838c2d 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -38,13 +38,6 @@ data: ABRT support for Ruby buildorder: 102 ref: master - rubygem-bundler: - # From rubygem-bundler.spec Summary - rationale: >- - Library and utilities to manage a Ruby application's gem - dependencies - buildorder: 102 - ref: master rubygem-mysql2: # From rubygem-mysql2.spec Summary rationale: >- @@ -86,6 +79,7 @@ data: - rubygems - rubygems-devel - rubygem-bigdecimal + - rubygem-bundler - rubygem-did_you_mean - rubygem-io-console - rubygem-json @@ -100,8 +94,6 @@ data: - rubygem-xmlrpc # From rubygem-abrt.spec - rubygem-abrt - # From rubygem-bundler.spec - - rubygem-bundler # From rubygem-mysql2.spec - rubygem-mysql2 # From rubygem-pg.spec From 09fa9ca804db58d0fdc457ac00a18b2f76d28ef1 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Wed, 29 May 2019 14:55:49 +0200 Subject: [PATCH 15/26] Change ruby-irb to rubygem-irb. Because rpms/ruby changed the package name. --- ruby.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.yaml b/ruby.yaml index e838c2d..dff0f89 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -74,7 +74,6 @@ data: # From ruby.spec - ruby - ruby-devel - - ruby-irb - ruby-libs - rubygems - rubygems-devel @@ -82,6 +81,7 @@ data: - rubygem-bundler - rubygem-did_you_mean - rubygem-io-console + - rubygem-irb - rubygem-json - rubygem-minitest - rubygem-net-telnet From 0f8fedf4e98a87c9f1322098e0cdc26beaaa093e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 12 Aug 2019 15:07:09 +0000 Subject: [PATCH 16/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 28d4f50f244e1abf9e3aab94044d944d9df87ea8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 13 Aug 2019 20:04:52 +0000 Subject: [PATCH 17/26] Branching f31 from rawhide Signed-off-by: Fedora Release Engineering From 6b37365700a2ad968f02aa70aaee35a816cb90d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 26 Aug 2019 14:03:56 +0000 Subject: [PATCH 18/26] Branching f31 from rawhide, second attempt after platform:f32 enablement Signed-off-by: Fedora Release Engineering From aec408b5ec8617a4de91771f5a33e015047b09ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 22 Sep 2019 07:59:10 +0000 Subject: [PATCH 19/26] Branching f31 from rawhide, fourth attempt after platform:f32 enablement due to https://pagure.io/releng/issue/8664 Signed-off-by: Fedora Release Engineering From a61d136f698ca0f0a70f4b500b1e3ae192fb744b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 6 Feb 2020 18:30:07 +0000 Subject: [PATCH 20/26] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering From afeda4b52594c78efd042479ad1be9d35fafdd45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 14 Feb 2020 17:11:07 +0000 Subject: [PATCH 21/26] Branching f32 from rawhide Signed-off-by: Fedora Release Engineering From ddec35ca58eecb31bc4b24675e2f9e3b94b7cca4 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 22 May 2020 17:27:55 +0200 Subject: [PATCH 22/26] Add ruby-default-gems RPM. --- ruby.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruby.yaml b/ruby.yaml index dff0f89..58445d3 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -75,10 +75,12 @@ data: - ruby - ruby-devel - ruby-libs + - ruby-default-gems - rubygems - rubygems-devel - rubygem-bigdecimal - rubygem-bundler + # It's used in Ruby 2.6 on f31. - rubygem-did_you_mean - rubygem-io-console - rubygem-irb From fbccca2e7960d194a4d77cb0284f7657382182ef Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Fri, 22 May 2020 17:56:52 +0200 Subject: [PATCH 23/26] Remove "-f28", as it's not the build target any more. --- ruby.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 58445d3..3935c2c 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: [] requires: - platform: [-f28] + platform: [] components: # SRPMs rpms: From 368675fe5ef53c2143f623394ff3c44aef6dd6c2 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Mon, 25 May 2020 19:22:36 +0200 Subject: [PATCH 24/26] Fix build failures. * Skip el8 target to avoid the following error. "error: one or more PCH files were found, but they were invalid". * Set %_without_hardening_test macro to avoid checksec error on f30. --- ruby.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index 3935c2c..c4e27fb 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -19,9 +19,9 @@ data: dependencies: - buildrequires: # platform: [] is recommended. - platform: [] + platform: [-el8] requires: - platform: [] + platform: [-el8] components: # SRPMs rpms: @@ -66,6 +66,8 @@ data: macros: | # To disable tests in several packages. %_without_tests 1 + # To avoid the error by rpms/ruby `checksec --file` on f30. + %_without_hardening_test 1 api: # RPMs # From *.spec %package From ee9e673941ccf7ad71c35f2d14cb58f5a680f9c2 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Tue, 11 Aug 2020 13:41:48 +0200 Subject: [PATCH 25/26] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby.yaml b/ruby.yaml index c4e27fb..09ab1ef 100644 --- a/ruby.yaml +++ b/ruby.yaml @@ -66,8 +66,8 @@ data: macros: | # To disable tests in several packages. %_without_tests 1 - # To avoid the error by rpms/ruby `checksec --file` on f30. - %_without_hardening_test 1 + # To avoid the test faiures by timeout in ruby. + %test_timeout_scale 6 api: # RPMs # From *.spec %package From 3d77066f0cfcc0959287567405ba7973bfa6a0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Aug 2020 04:49:38 +0000 Subject: [PATCH 26/26] Branching f33 from rawhide Signed-off-by: Fedora Release Engineering