From 57e056ac726b4599eb0984817bd545082baf3199 Mon Sep 17 00:00:00 2001
From: Kentaro Hayashi <hayashi@clear-code.com>
Date: Fri, 7 Feb 2025 18:49:58 +0900
Subject: [PATCH] github: add Ruby 3.4 for CI (#118)

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
---
 .github/workflows/ci.yml      | 75 ++++++++++-------------------------
 .github/workflows/pr.yml      | 68 ++++++++++---------------------
 test/docker/Dockerfile.ruby34 |  7 ++++
 3 files changed, 49 insertions(+), 101 deletions(-)
 create mode 100644 test/docker/Dockerfile.ruby34

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f0fbe11..62cab20 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,67 +6,36 @@ on:
       - master
 
 jobs:
-  ubuntu:
+  docker:
+    name: ${{ matrix.target.env }}
+    strategy:
+      matrix:
+        target:
+          - env: ubuntu
+            dockerfile: Dockerfile.ubuntu
+          - env: td-agent-deb
+            dockerfile: Dockerfile.tdagent-ubuntu
+          - env: td-agent-rpm
+            dockerfile: Dockerfile.tdagent-almalinux
+          - env: ruby32
+            dockerfile: Dockerfile.ruby32
+          - env: ruby34
+            dockerfile: Dockerfile.ruby34
     runs-on: ubuntu-latest
     steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: test/docker/Dockerfile.ubuntu
-  tdagent-deb:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: test/docker/Dockerfile.tdagent-ubuntu
-  tdagent-rpm:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: test/docker/Dockerfile.tdagent-almalinux
-  ruby32:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
+      - uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
-          file: test/docker/Dockerfile.ruby32
+          file: test/docker/${{ matrix.target.dockerfile }}
   rubocop:
     runs-on: ubuntu-latest
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         uses: ruby/setup-ruby@v1
         with:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 094c7f9..8c19f65 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -4,67 +4,39 @@ on:
   pull_request:
 
 jobs:
-  ubuntu:
+  docker:
+    name: ${{ matrix.target.env }}
+    strategy:
+      matrix:
+        target:
+          - env: ubuntu
+            dockerfile: Dockerfile.ubuntu
+          - env: td-agent-deb
+            dockerfile: Dockerfile.tdagent-ubuntu
+          - env: td-agent-rpm
+            dockerfile: Dockerfile.tdagent-almalinux
+          - env: ruby32
+            dockerfile: Dockerfile.ruby32
+          - env: ruby34
+            dockerfile: Dockerfile.ruby34
     runs-on: ubuntu-latest
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
-          file: test/docker/Dockerfile.ubuntu
-  tdagent-deb:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: test/docker/Dockerfile.tdagent-ubuntu
-  tdagent-rpm:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: test/docker/Dockerfile.tdagent-almalinux
-  ruby32:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v2
-        with:
-          file: test/docker/Dockerfile.ruby32
+          file: test/docker/${{ matrix.target.dockerfile }}
   rubocop:
     runs-on: ubuntu-latest
     steps:
       -
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       -
         uses: ruby/setup-ruby@v1
         with:
diff --git a/test/docker/Dockerfile.ruby34 b/test/docker/Dockerfile.ruby34
new file mode 100644
index 0000000..606aa48
--- /dev/null
+++ b/test/docker/Dockerfile.ruby34
@@ -0,0 +1,7 @@
+FROM ruby:3.4
+
+WORKDIR /usr/local/src
+
+COPY . .
+RUN bundle install -j4 -r3
+RUN bundle exec rake test TESTOPTS="-v"