From f89dc844c48dcb2bccdac81e1b08ef3455f8b2d6 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sat, 23 Mar 2024 16:22:12 -0400
Subject: [PATCH 1/3] ci: rename pipeline, update versions, drop windows and
 macos

- rename pipeline to "ci.yml"
- update to ruby 3.3 for rubocop
- update actions/checkout to v4
- remove the no-longer-necessary pinning of bundler
- drop windows and macos tests because this gem doesn't need it
---
 .github/workflows/{ci-test.yml => ci.yml} | 24 +++--------------------
 1 file changed, 3 insertions(+), 21 deletions(-)
 rename .github/workflows/{ci-test.yml => ci.yml} (62%)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci.yml
similarity index 62%
rename from .github/workflows/ci-test.yml
rename to .github/workflows/ci.yml
index d2e583de..45d8b5c0 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,10 @@ jobs:
   rubocop:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: "3.2"
+        ruby-version: "3.3"
         bundler-cache: true
     - run: bundle exec rake rubocop
 
@@ -36,27 +36,9 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby-version}}
         bundler-cache: true
-        bundler: 2.3.26 # https://github.com/rubygems/rubygems/issues/6435
-    - run: bundle exec rake test
-
-  test-platform:
-    needs: ["rubocop"]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: ["windows-latest", "macos-latest"]
-
-    runs-on: ${{matrix.platform}}
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: "3.2"
-        bundler-cache: true
-        bundler: latest
     - run: bundle exec rake test

From 3cff941230ef6bcaad4bddd06446e26b64ecbbd4 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sat, 23 Mar 2024 16:36:06 -0400
Subject: [PATCH 2/3] ci: extract upstream.yml pipeline

to test edge rubies
---
 .github/workflows/ci.yml       |  3 +--
 .github/workflows/upstream.yml | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45d8b5c0..efb79c2b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,8 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "jruby-9.4", "truffleruby", "head", "jruby-head", "truffleruby-head"]
-
+        ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "jruby-9.4", "truffleruby"]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index e37f025a..b1d0f2ff 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -1,4 +1,4 @@
-name: "ci"
+name: "upstream"
 
 concurrency:
   group: "${{github.workflow}}-${{github.ref}}"
@@ -19,7 +19,16 @@ on:
       - .github/workflows/upstream.yml # this file
 
 jobs:
-  skeleton:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ["head", "jruby-head", "truffleruby-head"]
     runs-on: ubuntu-latest
     steps:
-    - run: echo "Hello, World!"
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby-version}}
+        bundler-cache: true
+    - run: bundle exec rake test

From 9e72346881b4400a57a9fbeb61bca370fce67773 Mon Sep 17 00:00:00 2001
From: Mike Dalessio <mike.dalessio@gmail.com>
Date: Sat, 23 Mar 2024 16:50:04 -0400
Subject: [PATCH 3/3] ci: add upstream nokogiri integration test

---
 .github/workflows/upstream.yml | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/upstream.yml b/.github/workflows/upstream.yml
index b1d0f2ff..8a6ee609 100644
--- a/.github/workflows/upstream.yml
+++ b/.github/workflows/upstream.yml
@@ -26,9 +26,26 @@ jobs:
         ruby-version: ["head", "jruby-head", "truffleruby-head"]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{matrix.ruby-version}}
-        bundler-cache: true
-    - run: bundle exec rake test
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby-version}}
+          bundler-cache: true
+      - run: bundle exec rake test
+
+  upstream:
+    name: "upstream (${{matrix.name}})"
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { name: "nokogiri", git: "https://github.com/sparklemotion/nokogiri" }
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with: { ruby-version: "3.3" }
+      - run: |
+          bundle add ${{matrix.name}} --git="${{matrix.git}}"
+          bundle show
+      - run: bundle exec rake test