💚 More CI fixes

pboling · pboling · commit 52b95de0684b · 2025-07-07T14:42:01.000Z
diff --git a/.envrc b/.envrc
@@ -15,6 +15,7 @@ PATH_add bin
 # export RUBYOPT="-W0"
 
 ### External Testing Controls
+export COVERAGE=true
 export K_SOUP_COV_DO=true # Means you want code coverage
 # Available formats are html, xml, rcov, lcov, json, tty
 export K_SOUP_COV_COMMAND_NAME="MiniTest Coverage"
diff --git a/.github/workflows/current-runtime-heads.yml b/.github/workflows/current-runtime-heads.yml
@@ -29,7 +29,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+    name: Tests ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -56,6 +56,7 @@ jobs:
 
           # jruby-10.0 (targets Ruby 3.4 compatibility)
           - ruby: "jruby"
+            if: ${{ !env.ACT }}
             appraisal_name: "dep-heads"
             exec_cmd: "rake test"
             gemfile: "Appraisal.root"
diff --git a/.github/workflows/current.yml b/.github/workflows/current.yml
@@ -28,7 +28,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
+    name: Tests ${{ matrix.ruby }}@${{ matrix.appraisal_name }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -55,6 +55,7 @@ jobs:
 
           # jruby-10.0 (targets Ruby 3.4 compatibility)
           - ruby: "jruby"
+            if: ${{ !env.ACT }}
             appraisal_name: "r3"
             exec_cmd: "rake test"
             gemfile: "Appraisal.root"
diff --git a/.github/workflows/heads.yml b/.github/workflows/heads.yml
@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
+    name: Tests ${{ matrix.ruby }}@${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
@@ -56,6 +56,7 @@ jobs:
 
           # jruby-head
           - ruby: "jruby-head"
+            if: ${{ !env.ACT }}
             appraisal_name: "heads"
             exec_cmd: "rake test"
             gemfile: "Appraisal.root"
diff --git a/.github/workflows/jruby.yml b/.github/workflows/jruby.yml
@@ -27,8 +27,8 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
-    if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
+    name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
+    if: ${{ !env.ACT && !contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]') }}
     runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
     env: # $BUNDLE_GEMFILE - set at job level, so applies to all steps
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
+    name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
diff --git a/.github/workflows/supported.yml b/.github/workflows/supported.yml
@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
+    name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
diff --git a/.github/workflows/unsupported.yml b/.github/workflows/unsupported.yml
@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
+    name: Tests ${{ matrix.ruby }} ${{ matrix.appraisal_name }}${{ matrix.name_extra || '' }}
     if: "!contains(github.event.commits[0].message, '[ci skip]') && !contains(github.event.commits[0].message, '[skip ci]')"
     runs-on: ubuntu-22.04
     continue-on-error: ${{ matrix.experimental || endsWith(matrix.ruby, 'head') }}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,11 @@ latest_ruby_version = Gem::Version.create("3.4")
 current_ruby_version = Gem::Version.create(RUBY_VERSION)
 
 ### Std Lib Extracted Gems
-eval_gemfile "gemfiles/modular/x_std_libs/r3/libs.gemfile"
+if ENV.fetch("DEP_HEADS", "false").casecmp?("true")
+  eval_gemfile("gemfiles/modular/runtime_heads.gemfile")
+else
+  eval_gemfile "gemfiles/modular/x_std_libs/r3/libs.gemfile"
+end
 
 # Specify your gem's dependencies in ruby-openid.gemspec
 gemspec
diff --git a/ruby-openid2.gemspec b/ruby-openid2.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/oauth-xx/#{spec.name}"
   spec.summary = "A library for consuming and serving OpenID identities."
 
-  # Specify which files should be added to the gem when it is released.
+  # Specify which files are part of each release.
   spec.files = Dir[
     # Splats (alphabetical)
     "lib/**/*.rb",
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,14 +1,26 @@
 # External dependencies
-require "debug" if ENV.fetch("DEBUG", "false").casecmp?("true")
+begin
+  require "debug" if ENV.fetch("DEBUG", "false").casecmp?("true")
+rescue LoadError => error
+  warn "[test_helper.rb] failed to load debug gem" unless ENV["BUNDLE_GEMFILE"]
+  raise error unless error.message.include?("debug")
+end
 
 # The last thing before loading this gem is to set up code coverage
-begin
-  # This does not require "simplecov", but
-  require "kettle-soup-cover"
-  #   this next line has a side-effect of running `.simplecov`
-  require "simplecov" if defined?(Kettle::Soup::Cover) && Kettle::Soup::Cover::DO_COV
-rescue LoadError
-  nil
+if ENV.fetch("COVERAGE", "false").casecmp?("true")
+  begin
+    # This does not require "simplecov", but
+    require "kettle-soup-cover"
+    #   this next line has a side effect of running `.simplecov`
+    require "simplecov" if defined?(Kettle::Soup::Cover) && Kettle::Soup::Cover::DO_COV
+
+    SimpleCov.external_at_exit = true
+  rescue LoadError => error
+    warn "[test_helper.rb] failed to load test coverage gems" unless ENV["BUNDLE_GEMFILE"]
+    raise error unless error.message.include?("kettle")
+  end
+else
+  warn("[test_helper.rb] not loading test coverage gems; override with COVERAGE=true") if ENV["BUNDLE_GEMFILE"]
 end
 
 # Testing libraries
