Skip to content

Commit acd2014

Browse files
committed
github: simplify with matrix
Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
1 parent 8d0c17f commit acd2014

File tree

2 files changed

+35
-94
lines changed

2 files changed

+35
-94
lines changed

.github/workflows/ci.yml

Lines changed: 19 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,62 +6,31 @@ on:
66
- master
77

88
jobs:
9-
ubuntu:
9+
docker:
10+
name: ${{ matrix.target.env }}
11+
strategy:
12+
matrix:
13+
target:
14+
- env: ubuntu
15+
dockerfile: Dockerfile.ubuntu
16+
- env: td-agent-deb
17+
dockerfile: Dockerfile.tdagent-ubuntu
18+
- env: td-agent-rpm
19+
dockerfile: Dockerfile.tdagent-almalinux
20+
- env: ruby32
21+
dockerfile: Dockerfile.ruby32
22+
- env: ruby34
23+
dockerfile: Dockerfile.ruby34
1024
runs-on: ubuntu-latest
1125
steps:
12-
-
13-
uses: actions/checkout@v3
14-
-
15-
name: Set up Docker Buildx
16-
uses: docker/setup-buildx-action@v3
17-
-
18-
name: Build and push
19-
id: docker_build
20-
uses: docker/build-push-action@v6
21-
with:
22-
file: test/docker/Dockerfile.ubuntu
23-
tdagent-deb:
24-
runs-on: ubuntu-latest
25-
steps:
26-
-
27-
uses: actions/checkout@v3
28-
-
29-
name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@v3
31-
-
32-
name: Build and push
33-
id: docker_build
34-
uses: docker/build-push-action@v6
35-
with:
36-
file: test/docker/Dockerfile.tdagent-ubuntu
37-
tdagent-rpm:
38-
runs-on: ubuntu-latest
39-
steps:
40-
-
41-
uses: actions/checkout@v4
42-
-
43-
name: Set up Docker Buildx
44-
uses: docker/setup-buildx-action@v3
45-
-
46-
name: Build and push
47-
id: docker_build
48-
uses: docker/build-push-action@v6
49-
with:
50-
file: test/docker/Dockerfile.tdagent-almalinux
51-
ruby32:
52-
runs-on: ubuntu-latest
53-
steps:
54-
-
55-
uses: actions/checkout@v4
56-
-
57-
name: Set up Docker Buildx
26+
- uses: actions/checkout@v3
27+
- name: Set up Docker Buildx
5828
uses: docker/setup-buildx-action@v3
59-
-
60-
name: Build and push
29+
- name: Build and push
6130
id: docker_build
6231
uses: docker/build-push-action@v6
6332
with:
64-
file: test/docker/Dockerfile.ruby32
33+
file: test/docker/${{ matrix.target.dockerfile }}
6534
rubocop:
6635
runs-on: ubuntu-latest
6736
steps:

.github/workflows/pr.yml

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@ on:
44
pull_request:
55

66
jobs:
7-
ubuntu:
7+
docker:
8+
name: ${{ matrix.target.env }}
9+
strategy:
10+
matrix:
11+
target:
12+
- env: ubuntu
13+
dockerfile: Dockerfile.ubuntu
14+
- env: td-agent-deb
15+
dockerfile: Dockerfile.tdagent-ubuntu
16+
- env: td-agent-rpm
17+
dockerfile: Dockerfile.tdagent-almalinux
18+
- env: ruby32
19+
dockerfile: Dockerfile.ruby32
20+
- env: ruby34
21+
dockerfile: Dockerfile.ruby34
822
runs-on: ubuntu-latest
923
steps:
1024
-
@@ -17,49 +31,7 @@ jobs:
1731
id: docker_build
1832
uses: docker/build-push-action@v6
1933
with:
20-
file: test/docker/Dockerfile.ubuntu
21-
tdagent-deb:
22-
runs-on: ubuntu-latest
23-
steps:
24-
-
25-
uses: actions/checkout@v4
26-
-
27-
name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v3
29-
-
30-
name: Build and push
31-
id: docker_build
32-
uses: docker/build-push-action@v6
33-
with:
34-
file: test/docker/Dockerfile.tdagent-ubuntu
35-
tdagent-rpm:
36-
runs-on: ubuntu-latest
37-
steps:
38-
-
39-
uses: actions/checkout@v4
40-
-
41-
name: Set up Docker Buildx
42-
uses: docker/setup-buildx-action@v3
43-
-
44-
name: Build and push
45-
id: docker_build
46-
uses: docker/build-push-action@v6
47-
with:
48-
file: test/docker/Dockerfile.tdagent-almalinux
49-
ruby32:
50-
runs-on: ubuntu-latest
51-
steps:
52-
-
53-
uses: actions/checkout@v4
54-
-
55-
name: Set up Docker Buildx
56-
uses: docker/setup-buildx-action@v3
57-
-
58-
name: Build and push
59-
id: docker_build
60-
uses: docker/build-push-action@v6
61-
with:
62-
file: test/docker/Dockerfile.ruby32
34+
file: test/docker/${{ matrix.target.dockerfile }}
6335
rubocop:
6436
runs-on: ubuntu-latest
6537
steps:

0 commit comments

Comments
 (0)