From ec0d2cd2f8944ef3f60ce18a21fc91a1d603ee7e Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sat, 14 Dec 2024 10:41:41 -0500
Subject: [PATCH] ci: simplify the "setup-ruby" ruby version config

---
 .github/workflows/ci.yml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f43f462608..7120b3a86d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,9 +95,8 @@ jobs:
   ruby_versions:
     needs: ["basic"]
     outputs:
-      setup_ruby: "['3.1', '3.2', '3.3', '3.4.0-rc1']"
-      setup_ruby_windows: "['3.1', '3.2', '3.3', 'head']"
-      nokogiri_test_image: "['3.1', '3.2', '3.3', '3.4-rc']"
+      setup_ruby: "['3.1', '3.2', '3.3', 'head']"
+      image_tag: "['3.1', '3.2', '3.3', '3.4-rc']"
     runs-on: ubuntu-latest
     steps:
       - run: echo "generating rubies ..."
@@ -126,7 +125,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ${{ fromJSON(needs.ruby_versions.outputs.nokogiri_test_image) }}
+        ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/sparklemotion/nokogiri-test:mri-${{matrix.ruby}}
@@ -150,7 +149,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ${{ fromJSON(needs.ruby_versions.outputs.nokogiri_test_image) }}
+        ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
         mem: ["ruby"]
         include:
           - sys: "disable"
@@ -321,7 +320,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_windows) }}
+        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
     runs-on: windows-2022
     steps:
       - name: configure git crlf
@@ -541,7 +540,7 @@ jobs:
       fail-fast: false
       matrix:
         sys: ["enable", "disable"]
-        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_windows) }}
+        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
     runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4
@@ -626,7 +625,7 @@ jobs:
           - arm-linux-musl
           - x86_64-linux-gnu
           - x86_64-linux-musl
-        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
+        ruby: ${{ fromJSON(needs.ruby_versions.outputs.image_tag) }}
         include:
           # declare docker image for each platform
           - { platform: aarch64-linux-musl, docker_tag: "-alpine", bootstrap: "apk add bash build-base &&" }
@@ -652,7 +651,6 @@ jobs:
             ${{ matrix.docker_platform }} ruby:${{ matrix.ruby }}${{ matrix.docker_tag }} \
             sh -c "
               ${{ matrix.bootstrap }}
-              ${{ matrix.rubyenv }}
               ./scripts/test-gem-install gems
             "
 
@@ -688,7 +686,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby_windows) }}
+        ruby: ${{ fromJSON(needs.ruby_versions.outputs.setup_ruby) }}
     runs-on: windows-2022
     steps:
       - uses: actions/checkout@v4