Skip to content

Commit ab4f8c1

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

File tree

1 file changed

+18
-50
lines changed

1 file changed

+18
-50
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,32 @@ on:
44
push:
55
branches:
66
- master
7+
pull_request:
78

89
jobs:
9-
ubuntu:
10+
docker:
11+
name: ${{ matrix.target.env }}
12+
strategy:
13+
matrix:
14+
target:
15+
- env: ubuntu
16+
dockerfile: Dockerfile.ubuntu
17+
- env: tdagent-ubuntu
18+
dockerfile: Dockerfile.tdagent-ubuntu
19+
- env: ruby32
20+
dockerfile: Dockerfile.ruby32
21+
- env: ruby34
22+
dockerfile: Dockerfile.ruby34
1023
runs-on: ubuntu-latest
1124
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
25+
- uses: actions/checkout@v3
26+
- name: Set up Docker Buildx
5827
uses: docker/setup-buildx-action@v3
59-
-
60-
name: Build and push
28+
- name: Build and push
6129
id: docker_build
6230
uses: docker/build-push-action@v6
6331
with:
64-
file: test/docker/Dockerfile.ruby32
32+
file: test/docker/${{ matrix.target.dockerfile }}
6533
rubocop:
6634
runs-on: ubuntu-latest
6735
steps:

0 commit comments

Comments
 (0)