👷 Normalize heads and current workflows

Author: pboling

.github/workflows/current.yml

@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }}@${{ matrix.name_extra || '' }}
+    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}
     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') }}
@@ -38,7 +38,7 @@ jobs:
         include:
           # Ruby 3.4
           - ruby: "ruby"
-            appraisal: "ruby-current"
+            appraisal: "current"
             exec_cmd: "rake spec"
             gemfile: "Appraisal.root"
             rubygems: latest
@@ -47,7 +47,7 @@ jobs:
 
           # truffleruby-24.1 (targets Ruby 3.3.5 compatibility)
           - ruby: "truffleruby"
-            appraisal: "ruby-current"
+            appraisal: "current"
             exec_cmd: "rake spec"
             gemfile: "Appraisal.root"
             rubygems: default
@@ -56,7 +56,7 @@ jobs:
 
           # jruby-9.4 (targets Ruby 3.1 compatibility)
           - ruby: "jruby"
-            appraisal: "ruby-current"
+            appraisal: "current"
             exec_cmd: "rake spec"
             gemfile: "Appraisal.root"
             rubygems: default
@@ -80,7 +80,7 @@ jobs:
       # NOTE: This does not use the main Gemfile at all.
       - name: Install Root Appraisal
         run: bundle
-      - name: Appraisal for ${{ matrix.appraisal }}
+      - name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle
-      - name: Tests for ${{ matrix.ruby }}@${{ matrix.name_extra }} via ${{ matrix.exec_cmd }}
+      - name: Tests for ${{ matrix.ruby }}@${{ matrix.appraisal }} (${{ matrix.name_extra }}?) via ${{ matrix.exec_cmd }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

.github/workflows/heads.yml

@@ -26,7 +26,7 @@ concurrency:
 
 jobs:
   test:
-    name: Specs ${{ matrix.ruby }} ${{ matrix.appraisal }}${{ matrix.name_extra || '' }}
+    name: Specs ${{ matrix.ruby }}@${{ matrix.appraisal }}${{ 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') }}
@@ -39,23 +39,23 @@ jobs:
           # NOTE: Heads use default rubygems / bundler; their defaults are custom, unreleased, and from the future!
           # ruby-head
           - ruby: "ruby-head"
-            appraisal: "ruby-head"
+            appraisal: "head"
             exec_cmd: "rake spec"
             gemfile: "Appraisal.root"
             rubygems: default
             bundler: default
 
           # truffleruby-head
           - ruby: "truffleruby-head"
-            appraisal: "truffleruby-head"
+            appraisal: "head"
             exec_cmd: "rake spec"
             gemfile: "Appraisal.root"
             rubygems: default
             bundler: default
 
           # jruby-head
           - ruby: "jruby-head"
-            appraisal: "jruby-head"
+            appraisal: "head"
             exec_cmd: "rake spec"
             gemfile: "Appraisal.root"
             rubygems: default
@@ -78,7 +78,7 @@ jobs:
       # NOTE: This does not use the main Gemfile at all.
       - name: Install Root Appraisal
         run: bundle
-      - name: Appraisal for ${{ matrix.appraisal }}
+      - name: Appraisal for ${{ matrix.ruby }}@${{ matrix.appraisal }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle
-      - name: Tests for ${{ matrix.ruby }} via ${{ matrix.exec_cmd }}
+      - name: Tests for ${{ matrix.ruby }}@${{ matrix.appraisal }} via ${{ matrix.exec_cmd }}
         run: bundle exec appraisal ${{ matrix.appraisal }} bundle exec ${{ matrix.exec_cmd }}

Appraisals

@@ -1,5 +1,21 @@
 # frozen_string_literal: true
 
+# Used for head (nightly) releases of ruby, truffleruby, and jruby.
+# Split into discrete appraisals if one of them needs a dependency locked discretely.
+appraise "head" do
+  gem "mutex_m", ">= 0.2"
+  gem "stringio", ">= 3.0"
+  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
+end
+
+# Used for current releases of ruby, truffleruby, and jruby.
+# Split into discrete appraisals if one of them needs a dependency locked discretely.
+appraise "current" do
+  gem "mutex_m", ">= 0.2"
+  gem "stringio", ">= 3.0"
+  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
+end
+
 appraise "ruby-2-2" do
   remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
 end
@@ -52,12 +68,6 @@ appraise "ruby-3-3" do
   remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
 end
 
-appraise "ruby-current" do
-  gem "mutex_m", ">= 0.2"
-  gem "stringio", ">= 3.0"
-  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
-end
-
 # Only run security audit on latest Ruby version
 appraise "audit" do
   gem "mutex_m", "~> 0.2"
@@ -81,21 +91,3 @@ appraise "style" do
   eval_gemfile "modular/style.gemfile"
   remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
 end
-
-appraise "ruby-head" do
-  gem "mutex_m", ">= 0.2"
-  gem "stringio", ">= 3.0"
-  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
-end
-
-appraise "truffleruby-head" do
-  gem "mutex_m", ">= 0.2"
-  gem "stringio", ">= 3.0"
-  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
-end
-
-appraise "jruby-head" do
-  gem "mutex_m", ">= 0.2"
-  gem "stringio", ">= 3.0"
-  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
-end