From 2e1ff55c6369ef664e7709c2a2d79247dfc298c6 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 6 May 2024 09:02:58 +0200 Subject: [PATCH] Use gemfile.d for upstream CI (#116) The gemspec shouldn't contain environment variables, because it's also used in other contexts where it could break. In common CI we read gemfile.d/*.rb so this is the best place for bundler overrides. Fixes: 3eedb81546d5 ("feat(actions): switch to upstream CI templates (#113)") --- foreman_wreckingball.gemspec | 8 +------- gemfile.d/tasks.rb | 6 ++++++ 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 gemfile.d/tasks.rb diff --git a/foreman_wreckingball.gemspec b/foreman_wreckingball.gemspec index 53a58b1..7ccf95e 100644 --- a/foreman_wreckingball.gemspec +++ b/foreman_wreckingball.gemspec @@ -19,13 +19,7 @@ Gem::Specification.new do |s| s.test_files = Dir['test/**/*'] s.add_dependency 'foreman_puppet' - - case ENV['FOREMAN_VERSION'] - when '3.7-stable', '3.8-stable' - s.add_dependency 'foreman-tasks', '>= 8.0.0', '< 9.0.0' - else - s.add_dependency 'foreman-tasks' - end + s.add_dependency 'foreman-tasks' s.add_development_dependency 'rdoc' s.add_development_dependency 'theforeman-rubocop', '~> 0.1.2' diff --git a/gemfile.d/tasks.rb b/gemfile.d/tasks.rb new file mode 100644 index 0000000..a777483 --- /dev/null +++ b/gemfile.d/tasks.rb @@ -0,0 +1,6 @@ +# frozen_string_literal: true + +case ENV['FOREMAN_VERSION'] +when '3.7-stable', '3.8-stable' + gem 'foreman-tasks', '~> 8.0' +end