From 27634ca667f8aa53fd79dfcaa5d2af0315e2cfa0 Mon Sep 17 00:00:00 2001
From: James Couball <jcouball@yahoo.com>
Date: Fri, 13 Sep 2024 14:26:46 -0700
Subject: [PATCH] Update continuous integration and experimental ruby builds

---
 .../{main.yml => continuous_integration.yml}  | 43 ++++++++++-------
 .../workflows/experimental_ruby_builds.yml    | 46 +++++++++++++++++++
 discovery_v1.gemspec                          | 12 ++---
 3 files changed, 78 insertions(+), 23 deletions(-)
 rename .github/workflows/{main.yml => continuous_integration.yml} (59%)
 create mode 100644 .github/workflows/experimental_ruby_builds.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/continuous_integration.yml
similarity index 59%
rename from .github/workflows/main.yml
rename to .github/workflows/continuous_integration.yml
index b83818c..6528f4b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -1,28 +1,39 @@
-name: CI Build
+name: Continuous Integration
 
 on:
   push:
-    branches:
-      - main
+    branches: [main]
 
   pull_request:
-     branches: [ main ]
+    branches: [main]
+
+  workflow_dispatch:
+
+# Supported platforms / Ruby versions:
+#  - Ubuntu: MRI (3.1, 3.2, 3.3), TruffleRuby (24), JRuby (9.4)
+#  - Windows: MRI (3.1), JRuby (9.4)
 
 jobs:
   build:
+    name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
+
+    runs-on: ${{ matrix.operating-system }}
     continue-on-error: true
 
     strategy:
+      fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', head]
+        ruby: ["3.1", "3.2", "3.3", "jruby-9.4", "truffleruby-24"]
         operating-system: [ubuntu-latest]
-
-    name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
-    runs-on: ${{ matrix.operating-system }}
+        include:
+          - ruby: "3.1"
+            operating-system: windows-latest
+          - ruby: "jruby-9.4"
+            operating-system: windows-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize Ruby
         uses: ruby/setup-ruby@v1
@@ -34,14 +45,14 @@ jobs:
         run: bundle exec rake
 
   coverage:
-    needs: [ build ]
-    runs-on: ubuntu-latest
-
     name: Report test coverage to CodeClimate
 
+    needs: [build]
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize Ruby
         uses: ruby/setup-ruby@v1
@@ -49,12 +60,10 @@ jobs:
           ruby-version: 3.1
           bundler-cache: true
 
-      - name: Run tests
-        run: bundle exec rake spec
-
       - name: Report test coverage
-        uses: paambaati/codeclimate-action@v3.2.0
+        uses: paambaati/codeclimate-action@v9
         env:
           CC_TEST_REPORTER_ID: 9cee910e20024e0fcb3a6a4ad2e7a71a2031409adac7134e196627bf2ccecf02
         with:
+          coverageCommand: bundle exec rake spec
           coverageLocations: ${{github.workspace}}/coverage/lcov/*.lcov:lcov
diff --git a/.github/workflows/experimental_ruby_builds.yml b/.github/workflows/experimental_ruby_builds.yml
new file mode 100644
index 0000000..5ab1205
--- /dev/null
+++ b/.github/workflows/experimental_ruby_builds.yml
@@ -0,0 +1,46 @@
+name: Experimental Ruby Builds
+
+on:
+  push:
+    branches: [main]
+
+  workflow_dispatch:
+
+# Experimental platforms / Ruby versions:
+#  - Ubuntu: MRI (head), TruffleRuby (head), JRuby (head)
+#  - Windows: MRI (head), JRuby (head)
+
+jobs:
+  build:
+    name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
+    
+    runs-on: ${{ matrix.operating-system }}
+    continue-on-error: true
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - ruby: head
+            operating-system: ubuntu-latest
+          - ruby: head
+            operating-system: windows-latest
+          - ruby: truffleruby-head
+            operating-system: ubuntu-latest
+          - ruby: jruby-head
+            operating-system: ubuntu-latest
+          - ruby: jruby-head
+            operating-system: windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Initialize Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run rake
+        run: bundle exec rake
diff --git a/discovery_v1.gemspec b/discovery_v1.gemspec
index ce1f12d..d8094e3 100644
--- a/discovery_v1.gemspec
+++ b/discovery_v1.gemspec
@@ -33,10 +33,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler-audit', '~> 0.9'
-  spec.add_development_dependency 'create_github_release', '~> 1.0'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.12'
-  spec.add_development_dependency 'rubocop', '~> 1.57'
+  spec.add_development_dependency 'create_github_release', '~> 1.5'
+  spec.add_development_dependency 'rake', '~> 13.2'
+  spec.add_development_dependency 'rspec', '~> 3.13'
+  spec.add_development_dependency 'rubocop', '~> 1.66'
   spec.add_development_dependency 'simplecov', '~> 0.22'
   spec.add_development_dependency 'simplecov-lcov', '~> 0.8'
 
@@ -48,8 +48,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '~> 7.0'
   spec.add_development_dependency 'github_pages_rake_tasks', '~> 0.1'
-  spec.add_dependency 'google-apis-discovery_v1', '~> 0.14'
-  spec.add_dependency 'json_schemer', '~> 2.0'
+  spec.add_dependency 'google-apis-discovery_v1', '~> 0.19'
+  spec.add_dependency 'json_schemer', '~> 2.3'
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 end