github: simplify with matrix

Signed-off-by: Kentaro Hayashi <[email protected]>
fluent-plugins-nursery · Feb 6, 2025 · ddb8be3 · ddb8be3
1 parent 8d0c17f
commit ddb8be3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 94 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,64 +4,34 @@ on:
   push:
     branches:
       - master
+  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
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
-        id: docker_build
-        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@v3
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          file: test/docker/Dockerfile.tdagent-ubuntu
-  tdagent-rpm:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          file: test/docker/Dockerfile.tdagent-almalinux
-  ruby32:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
+      - uses: actions/checkout@v3
+      - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
+      - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v6
         with:
-          file: test/docker/Dockerfile.ruby32
+          file: test/docker/${{ matrix.target.dockerfile }}
   rubocop:
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -4,7 +4,21 @@ 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:
       -
@@ -17,49 +31,7 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v6
         with:
-          file: test/docker/Dockerfile.ubuntu
-  tdagent-deb:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          file: test/docker/Dockerfile.tdagent-ubuntu
-  tdagent-rpm:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          file: test/docker/Dockerfile.tdagent-almalinux
-  ruby32:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        uses: actions/checkout@v4
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      -
-        name: Build and push
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          file: test/docker/Dockerfile.ruby32
+          file: test/docker/${{ matrix.target.dockerfile }}
   rubocop:
     runs-on: ubuntu-latest
     steps: