From 2af8f20750b4e40f112e2a91a8153c95929eefd2 Mon Sep 17 00:00:00 2001
From: Takuro Ashie <ashie@clear-code.com>
Date: Mon, 27 Dec 2021 23:43:46 +0900
Subject: [PATCH 1/2] GitHub Actions: Use latest RubyInstaller 3.0 & Fiddle

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
---
 .github/workflows/windows-test.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows-test.yaml b/.github/workflows/windows-test.yaml
index 479050f840..1f43f18e57 100644
--- a/.github/workflows/windows-test.yaml
+++ b/.github/workflows/windows-test.yaml
@@ -18,9 +18,9 @@ jobs:
           - windows-latest
         experimental: [false]
         include:
-          - ruby-version: '3.0.2'
+          - ruby-version: '3.0.3'
             os: windows-latest
-            experimental: true
+            experimental: false
             # On Ruby 3.0, we need to use fiddle 1.0.8 or later to retrieve correct
             # error code. In addition, we have to specify the path of fiddle by RUBYLIB
             # because RubyInstaller loads Ruby's bundled fiddle before initializing gem.
@@ -28,7 +28,7 @@ jobs:
             # * https://github.com/ruby/fiddle/issues/72
             # * https://bugs.ruby-lang.org/issues/17813
             # * https://github.com/oneclick/rubyinstaller2/blob/8225034c22152d8195bc0aabc42a956c79d6c712/lib/ruby_installer/build/dll_directory.rb
-            ruby-lib-opt: RUBYLIB=%RUNNER_TOOL_CACHE%/Ruby/3.0.2/x64/lib/ruby/gems/3.0.0/gems/fiddle-1.0.8/lib
+            ruby-lib-opt: RUBYLIB=%RUNNER_TOOL_CACHE%/Ruby/3.0.3/x64/lib/ruby/gems/3.0.0/gems/fiddle-1.1.0/lib
 
     name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps:
@@ -37,9 +37,9 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-      - name: Add Fiddle 1.0.8
-        if: ${{ matrix.ruby-version == '3.0.2' }}
-        run: gem install fiddle --version 1.0.8
+      - name: Add Fiddle 1.1.0
+        if: ${{ matrix.ruby-version == '3.0.3' }}
+        run: gem install fiddle --version 1.1.0
       - name: Install dependencies
         run: ridk exec bundle install
       - name: Run tests

From 39dce90b2c3975bb1f324db07ea8130a464503ca Mon Sep 17 00:00:00 2001
From: Takuro Ashie <ashie@clear-code.com>
Date: Fri, 4 Feb 2022 15:05:50 +0900
Subject: [PATCH 2/2] CI: Add Ruby 3.1 for GNU/Linux & macOS

For windows, we have several known issues on RubyInstaller 3.1 so that
we don't yet add for now:

https://github.com/fluent/fluentd/pull/3585

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
---
 .github/workflows/linux-test.yaml | 2 +-
 .github/workflows/macos-test.yaml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux-test.yaml b/.github/workflows/linux-test.yaml
index 0fa526f131..f814623805 100644
--- a/.github/workflows/linux-test.yaml
+++ b/.github/workflows/linux-test.yaml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['3.0', '2.7', '2.6']
+        ruby-version: ['3.1', '3.0', '2.7', '2.6']
         os: [ubuntu-latest]
         experimental: [false]
         include:
diff --git a/.github/workflows/macos-test.yaml b/.github/workflows/macos-test.yaml
index 7729f48e86..630b03de7a 100644
--- a/.github/workflows/macos-test.yaml
+++ b/.github/workflows/macos-test.yaml
@@ -13,9 +13,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['head', '2.7']
+        ruby-version: ['3.1', '3.0', '2.7']
         os: [macos-latest]
         experimental: [true]
+        include:
+          - ruby-version: head
+            os: macos-latest
+            experimental: true
 
     name: Unit testing with Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
     steps: