From 4326957664e8037e836bcf218bc609b5de446d39 Mon Sep 17 00:00:00 2001 From: fallwith Date: Thu, 15 Aug 2024 18:15:02 -0700 Subject: [PATCH] CI: permit non 'gem' lines in Envfile use a new comment system to permit non 'gem' lines in `Envfile` files --- test/multiverse/lib/multiverse/gem_manifest.rb | 2 +- test/multiverse/suites/redis/Envfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/multiverse/lib/multiverse/gem_manifest.rb b/test/multiverse/lib/multiverse/gem_manifest.rb index d8e8b2d708..c217ece836 100755 --- a/test/multiverse/lib/multiverse/gem_manifest.rb +++ b/test/multiverse/lib/multiverse/gem_manifest.rb @@ -66,7 +66,7 @@ def discover_suites def gems_from_gemfile_body(body, path) body.split("\n").each do |line| - next if line.empty? || line.match?(/(?:^\s*(?:#|if|else|end))|newrelic_(?:rpm|prepender)/) + next if line.empty? || line.match?(/(?:^\s*(?:#|if|else|end))|newrelic_(?:rpm|prepender)|# non-gem line/) if line =~ /.*gem\s+['"]([^'"]+)['"](?:,\s+['"]([^'"]+)['"])?/ gem = Regexp.last_match(1) diff --git a/test/multiverse/suites/redis/Envfile b/test/multiverse/suites/redis/Envfile index 46fec9230f..a8121081f5 100644 --- a/test/multiverse/suites/redis/Envfile +++ b/test/multiverse/suites/redis/Envfile @@ -36,7 +36,7 @@ if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0') gem 'rack' gem 'redis-clustering' - require 'redis' - ::Redis::Cluster.const_set(:Client, 'phony client definition') + require 'redis' # non-gem line + ::Redis::Cluster.const_set(:Client, 'phony client definition') # non-gem line GEMFILE end