!10 fix build failure due to rugegem-rspec updated
From: @wang--ge Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
6499d21ac6
52
0001-replace-wave-line-with-not.patch
Normal file
52
0001-replace-wave-line-with-not.patch
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
From 3a1ca5e2aa31ff040abcef119f01fa1e89c0cfbf Mon Sep 17 00:00:00 2001
|
||||||
|
From: wang--ge <wang__ge@126.com>
|
||||||
|
Date: Fri, 6 Jan 2023 17:38:16 +0800
|
||||||
|
Subject: [PATCH] replace wave line with not
|
||||||
|
|
||||||
|
---
|
||||||
|
cucumber.yml | 26 +++++++++++++-------------
|
||||||
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/cucumber.yml b/cucumber.yml
|
||||||
|
index da8e1af..7a014e4 100644
|
||||||
|
--- a/cucumber.yml
|
||||||
|
+++ b/cucumber.yml
|
||||||
|
@@ -5,22 +5,22 @@ require 'ffi'
|
||||||
|
|
||||||
|
java_version = (RUBY_DESCRIPTION.match(/.*?on.*?(1\.[\d]\..*? )/))[1] if defined?(JRUBY_VERSION)
|
||||||
|
|
||||||
|
-std_opts = "--color --exclude features/fixtures --require features --tags ~@unsupported-on"
|
||||||
|
-java_default_opts = "--tags ~@wip-jruby-java-1.6" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
|
||||||
|
+std_opts = "--color --exclude features/fixtures --require features --tags not@unsupported-on"
|
||||||
|
+java_default_opts = "--tags not@wip-jruby-java-1.6" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
|
||||||
|
java_wip_opts = "--tags @wip-jruby-java-1.6:3" if defined?(JRUBY_VERSION) && (java_version < '1.7.0')
|
||||||
|
|
||||||
|
ignore_opts = []
|
||||||
|
-ignore_opts << '--tags ~@ignore'
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-platform-java' if RUBY_PLATFORM.include? 'java'
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-platform-mri' if !RUBY_PLATFORM.include? 'java'
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-platform-windows' if FFI::Platform.windows?
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-platform-unix' if FFI::Platform.unix?
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-platform-mac' if FFI::Platform.mac?
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-ruby-older-2' if RUBY_VERSION < '2'
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-ruby-older-193' if RUBY_VERSION < '1.9.3'
|
||||||
|
-ignore_opts << '--tags ~@unsupported-on-ruby-older-19' if RUBY_VERSION < '1.9'
|
||||||
|
-ignore_opts << '--tags ~@requires-aruba-version-1' if Aruba::VERSION < '1'
|
||||||
|
+ignore_opts << '--tags not@ignore'
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-platform-java' if RUBY_PLATFORM.include? 'java'
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-platform-mri' if !RUBY_PLATFORM.include? 'java'
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-platform-windows' if FFI::Platform.windows?
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-platform-unix' if FFI::Platform.unix?
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-platform-mac' if FFI::Platform.mac?
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-ruby-older-2' if RUBY_VERSION < '2'
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-ruby-older-193' if RUBY_VERSION < '1.9.3'
|
||||||
|
+ignore_opts << '--tags not@unsupported-on-ruby-older-19' if RUBY_VERSION < '1.9'
|
||||||
|
+ignore_opts << '--tags not@requires-aruba-version-1' if Aruba::VERSION < '1'
|
||||||
|
ignore_opts = ignore_opts.join(' ')
|
||||||
|
%>
|
||||||
|
-default: <%= std_opts %> --tags ~@wip <%= java_default_opts %> <%= ignore_opts %>
|
||||||
|
+default: <%= std_opts %> --tags not@wip <%= java_default_opts %> <%= ignore_opts %>
|
||||||
|
wip: <%= std_opts %> --wip --tags @wip:3 <%= java_wip_opts %> <%= ignore_opts %>
|
||||||
|
--
|
||||||
|
2.27.0
|
||||||
|
|
||||||
@ -2,10 +2,11 @@
|
|||||||
Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
|
Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
|
||||||
Name: rubygem-%{gem_name}
|
Name: rubygem-%{gem_name}
|
||||||
Version: 0.14.14
|
Version: 0.14.14
|
||||||
Release: 1
|
Release: 2
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://github.com/cucumber/aruba
|
URL: https://github.com/cucumber/aruba
|
||||||
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
|
Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
|
||||||
|
Patch0: 0001-replace-wave-line-with-not.patch
|
||||||
BuildRequires: ruby(release) rubygems-devel ruby rubygem(cucumber) >= 1.3.19
|
BuildRequires: ruby(release) rubygems-devel ruby rubygem(cucumber) >= 1.3.19
|
||||||
BuildRequires: rubygem(childprocess) >= 0.5.6 rubygem(ffi) >= 1.9.10 rubygem(minitest)
|
BuildRequires: rubygem(childprocess) >= 0.5.6 rubygem(ffi) >= 1.9.10 rubygem(minitest)
|
||||||
BuildRequires: rubygem(pry) rubygem(rspec) >= 3 rubygem(contracts) >= 0.9
|
BuildRequires: rubygem(pry) rubygem(rspec) >= 3 rubygem(contracts) >= 0.9
|
||||||
@ -25,6 +26,7 @@ Documentation for %{name}
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{gem_name}-%{version}
|
%setup -q -n %{gem_name}-%{version}
|
||||||
%gemspec_remove_dep -g childprocess '>= 0.6.3'
|
%gemspec_remove_dep -g childprocess '>= 0.6.3'
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
gem build ../%{gem_name}-%{version}.gemspec
|
gem build ../%{gem_name}-%{version}.gemspec
|
||||||
@ -104,6 +106,9 @@ popd
|
|||||||
%{gem_instdir}/templates/
|
%{gem_instdir}/templates/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 09 2023 Ge Wang <wangge20@h-partners.com> -0.14.14-2
|
||||||
|
- replace wave line with not
|
||||||
|
|
||||||
* Tue Mar 29 2022 liyanan <liyanan32@huawei.com> - 0.14.14-1
|
* Tue Mar 29 2022 liyanan <liyanan32@huawei.com> - 0.14.14-1
|
||||||
- update to 0.14.14
|
- update to 0.14.14
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user