➕ cgi dependency for GHA

pboling · pboling · commit 1487b1ad8aed · 2025-07-08T00:43:23.000Z
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -46,6 +46,7 @@ GEM
     bundler-audit (0.9.2)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
+    cgi (0.5.0)
     concurrent-ruby (1.3.5)
     date (3.4.1)
     debug (1.11.0)
@@ -252,6 +253,7 @@ DEPENDENCIES
   appraisal!
   benchmark (~> 0.4)
   bundler-audit (~> 0.9.2)
+  cgi (~> 0.5.0)
   debug (~> 1.11)
   irb (~> 1.15, >= 1.15.2)
   kettle-soup-cover (~> 1.0, >= 1.0.9)
diff --git a/gemfiles/modular/cgi/r2/v0.1.gemfile b/gemfiles/modular/cgi/r2/v0.1.gemfile
@@ -1,3 +1,3 @@
-# Ruby >= 2.3.0
-# Last version compatible with Ruby 2.4
-gem "logger", ">= 1.5.3", "< 2"
+# Ruby >= 0
+# Last version to support Ruby <= 2.4
+gem "cgi", "~> 0.1.1"
diff --git a/gemfiles/modular/cgi/r2/v0.2.gemfile b/gemfiles/modular/cgi/r2/v0.2.gemfile
diff --git a/gemfiles/modular/cgi/r2/v0.4.gemfile b/gemfiles/modular/cgi/r2/v0.4.gemfile
@@ -0,0 +1,2 @@
+# Ruby >= 2.5
+gem "cgi", "~> 0.4.2"
diff --git a/gemfiles/modular/cgi/r2/v0.5.gemfile b/gemfiles/modular/cgi/r2/v0.5.gemfile
@@ -0,0 +1,2 @@
+# Ruby >= 2.5
+gem "cgi", "~> 0.5.0"
diff --git a/gemfiles/modular/cgi/r3/v0.3.gemfile b/gemfiles/modular/cgi/r3/v0.3.gemfile
@@ -0,0 +1,2 @@
+# Ruby >= 2.5
+gem "cgi", "~> 0.3.7"
diff --git a/gemfiles/modular/cgi/r3/v0.4.gemfile b/gemfiles/modular/cgi/r3/v0.4.gemfile
@@ -0,0 +1,2 @@
+# Ruby >= 2.5
+gem "cgi", "~> 0.4.2"
diff --git a/gemfiles/modular/cgi/r3/v0.5.gemfile b/gemfiles/modular/cgi/r3/v0.5.gemfile
@@ -0,0 +1,2 @@
+# Ruby >= 2.5
+gem "cgi", "~> 0.5.0"
diff --git a/gemfiles/modular/cgi/r3/v1.7.gemfile b/gemfiles/modular/cgi/r3/v1.7.gemfile
diff --git a/gemfiles/modular/cgi/vHEAD.gemfile b/gemfiles/modular/cgi/vHEAD.gemfile
@@ -1,2 +1,4 @@
-# Ruby >= 2.5 (dependency of omniauth)
-gem "logger", github: "ruby/logger", branch: "master"
+# Ruby 3.5 may remove cgi from std lib
+# See: https://bugs.ruby-lang.org/issues/21258
+# Ruby >= 2.5
+gem "cgi", github: "ruby/cgi", branch: "master"
diff --git a/gemfiles/modular/x_std_libs/r2/libs.gemfile b/gemfiles/modular/x_std_libs/r2/libs.gemfile
@@ -3,11 +3,8 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../../cgi/r2/v0.5.gemfile"
 eval_gemfile "../../logger/r2/v1.5.gemfile"
 eval_gemfile "../../net-http/r2/v0.3.gemfile"
 eval_gemfile "../../rexml/r2/v3.2.gemfile"
 eval_gemfile "../../uri/r2/v0.gemfile"
-
-# Ruby 3.5 may remove cgi from std lib
-# See: https://bugs.ruby-lang.org/issues/21258
-gem "cgi", ">= 0.5"
diff --git a/gemfiles/modular/x_std_libs/r2/set-1.gemfile b/gemfiles/modular/x_std_libs/r2/set-1.gemfile
@@ -3,6 +3,7 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../../cgi/r2/v0.4.gemfile"
 eval_gemfile "../../logger/r2/v1.5.gemfile"
 eval_gemfile "../../net-http/r2/v0.2.gemfile"
 eval_gemfile "../../rexml/r2/v3.1.gemfile"
diff --git a/gemfiles/modular/x_std_libs/r2/set-2.gemfile b/gemfiles/modular/x_std_libs/r2/set-2.gemfile
@@ -3,6 +3,7 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../../cgi/r2/v0.1.gemfile"
 eval_gemfile "../../logger/r2/v1.5.gemfile"
 eval_gemfile "../../net-http/r2/v0.1.gemfile"
 eval_gemfile "../../rexml/r2/v3.1.gemfile"
diff --git a/gemfiles/modular/x_std_libs/r3/libs.gemfile b/gemfiles/modular/x_std_libs/r3/libs.gemfile
@@ -3,6 +3,7 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../../cgi/r3/v0.5.gemfile"
 eval_gemfile "../../logger/r3/v1.7.gemfile"
 eval_gemfile "../../net-http/r3/v0.6.gemfile"
 eval_gemfile "../../rexml/r3/v3.4.gemfile"
diff --git a/gemfiles/modular/x_std_libs/r3/set-1.gemfile b/gemfiles/modular/x_std_libs/r3/set-1.gemfile
@@ -3,6 +3,7 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../../cgi/r3/v0.4.gemfile"
 eval_gemfile "../../logger/r3/v1.7.gemfile"
 eval_gemfile "../../net-http/r3/v0.5.gemfile"
 eval_gemfile "../../rexml/r3/v3.3.gemfile"
diff --git a/gemfiles/modular/x_std_libs/r3/set-2.gemfile b/gemfiles/modular/x_std_libs/r3/set-2.gemfile
@@ -3,6 +3,7 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../../cgi/r3/v0.3.gemfile"
 eval_gemfile "../../logger/r3/v1.7.gemfile"
 eval_gemfile "../../net-http/r3/v0.4.gemfile"
 eval_gemfile "../../rexml/r3/v3.3.gemfile"
diff --git a/gemfiles/modular/x_std_libs/vHEAD.gemfile b/gemfiles/modular/x_std_libs/vHEAD.gemfile
@@ -3,6 +3,7 @@
 #   make it difficult to build on GA CI with Ruby 2.7 and bundler v2.4.22.
 # See: https://github.com/rubygems/rubygems/issues/7178#issuecomment-2372558363
 #      https://github.com/ruby-openid/ruby-openid2/commit/bf0d6f38d92055b30ba4656234f1064f61abc403
+eval_gemfile "../cgi/vHEAD.gemfile"
 eval_gemfile "../logger/vHEAD.gemfile"
 eval_gemfile "../net-http/vHEAD.gemfile"
 eval_gemfile "../rexml/vHEAD.gemfile"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Ruby >= 2.5`
	`2`	`+gem "cgi", "~> 0.4.2"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Ruby >= 2.5`
	`2`	`+gem "cgi", "~> 0.5.0"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Ruby >= 2.5`
	`2`	`+gem "cgi", "~> 0.3.7"`