Skip to content

Commit a2d45de

Browse files
wandersonwhcrwandersonwhcr
authored
Merge pull request #53 from renatomefi/feature/update-tests
Update Tests
2 parents 717a9c7 + d559d93 commit a2d45de

File tree

2 files changed

+64
-66
lines changed

2 files changed

+64
-66
lines changed

‎.github/workflows/test.yaml‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -11,86 +11,86 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313

14-
- name: Checkout
15-
uses: actions/checkout@v2
16-
17-
- name: lint
18-
run: make lint
14+
- uses: actions/checkout@v2
15+
- run: make lint
1916

2017
test-71:
21-
name: php-7.1
2218
runs-on: ubuntu-latest
2319
needs: lint
2420
steps:
2521

26-
- name: Checkout
27-
uses: actions/checkout@v2
28-
29-
- name: alpine-3.7
30-
run: make test-image IMAGE="php:7.1-fpm-alpine3.7" DOCKERFILE="alpine"
31-
32-
- name: alpine-3.8
33-
run: make test-image IMAGE="php:7.1-fpm-alpine3.8" DOCKERFILE="alpine"
34-
35-
- name: stretch
36-
run: make test-image IMAGE="php:7.1-fpm-stretch" DOCKERFILE="stretch"
22+
- uses: actions/checkout@v2
23+
- run: make test-image IMAGE="php:7.1-fpm-alpine3.7" DOCKERFILE="alpine"
24+
- run: make test-image IMAGE="php:7.1-fpm-alpine3.8" DOCKERFILE="alpine"
25+
- run: make test-image IMAGE="php:7.1-fpm-alpine3.9" DOCKERFILE="alpine"
26+
- run: make test-image IMAGE="php:7.1-fpm-alpine3.10" DOCKERFILE="alpine"
27+
- run: make test-image IMAGE="php:7.1-fpm-stretch" DOCKERFILE="stretch"
28+
- run: make test-image IMAGE="php:7.1-fpm-buster" DOCKERFILE="buster"
3729

3830
test-72:
39-
name: php-7.2
4031
runs-on: ubuntu-latest
4132
needs: lint
4233
steps:
4334

44-
- name: Checkout
45-
uses: actions/checkout@v2
46-
47-
- name: alpine-3.7
48-
run: make test-image IMAGE="php:7.2-fpm-alpine3.7" DOCKERFILE="alpine"
49-
50-
- name: alpine-3.8
51-
run: make test-image IMAGE="php:7.2-fpm-alpine3.8" DOCKERFILE="alpine"
52-
53-
- name: stretch
54-
run: make test-image IMAGE="php:7.2-fpm-stretch" DOCKERFILE="stretch"
35+
- uses: actions/checkout@v2
36+
- run: make test-image IMAGE="php:7.2-fpm-alpine3.7" DOCKERFILE="alpine"
37+
- run: make test-image IMAGE="php:7.2-fpm-alpine3.8" DOCKERFILE="alpine"
38+
- run: make test-image IMAGE="php:7.2-fpm-alpine3.9" DOCKERFILE="alpine"
39+
- run: make test-image IMAGE="php:7.2-fpm-alpine3.10" DOCKERFILE="alpine"
40+
- run: make test-image IMAGE="php:7.2-fpm-alpine3.11" DOCKERFILE="alpine"
41+
- run: make test-image IMAGE="php:7.2-fpm-alpine3.12" DOCKERFILE="alpine"
42+
- run: make test-image IMAGE="php:7.2-fpm-stretch" DOCKERFILE="stretch"
43+
- run: make test-image IMAGE="php:7.2-fpm-buster" DOCKERFILE="buster"
5544

5645
test-73:
57-
name: php-7.3
5846
runs-on: ubuntu-latest
5947
needs: lint
6048
steps:
6149

62-
- name: Checkout
63-
uses: actions/checkout@v2
64-
65-
- name: alpine-3.8
66-
run: make test-image IMAGE="php:7.3-fpm-alpine3.8" DOCKERFILE="alpine"
67-
68-
- name: alpine-3.9
69-
run: make test-image IMAGE="php:7.3-fpm-alpine3.9" DOCKERFILE="alpine"
70-
71-
- name: alpine-3.10
72-
run: make test-image IMAGE="php:7.3-fpm-alpine3.10" DOCKERFILE="alpine"
73-
74-
- name: alpine-3.11
75-
run: make test-image IMAGE="php:7.3-fpm-alpine3.11" DOCKERFILE="alpine"
76-
77-
- name: stretch
78-
run: make test-image IMAGE="php:7.3-fpm-stretch" DOCKERFILE="stretch"
50+
- uses: actions/checkout@v2
51+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.8" DOCKERFILE="alpine"
52+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.9" DOCKERFILE="alpine"
53+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.10" DOCKERFILE="alpine"
54+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.11" DOCKERFILE="alpine"
55+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.12" DOCKERFILE="alpine"
56+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.13" DOCKERFILE="alpine"
57+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.14" DOCKERFILE="alpine"
58+
- run: make test-image IMAGE="php:7.3-fpm-alpine3.15" DOCKERFILE="alpine"
59+
- run: make test-image IMAGE="php:7.3-fpm-stretch" DOCKERFILE="stretch"
60+
- run: make test-image IMAGE="php:7.3-fpm-buster" DOCKERFILE="buster"
7961

8062
test-74:
81-
name: php-7.4
8263
runs-on: ubuntu-latest
8364
needs: lint
8465
steps:
8566

86-
- name: Checkout
87-
uses: actions/checkout@v2
67+
- uses: actions/checkout@v2
68+
- run: make test-image IMAGE="php:7.4-fpm-alpine3.10" DOCKERFILE="alpine"
69+
- run: make test-image IMAGE="php:7.4-fpm-alpine3.11" DOCKERFILE="alpine"
70+
- run: make test-image IMAGE="php:7.4-fpm-alpine3.12" DOCKERFILE="alpine"
71+
- run: make test-image IMAGE="php:7.4-fpm-alpine3.13" DOCKERFILE="alpine"
72+
- run: make test-image IMAGE="php:7.4-fpm-alpine3.14" DOCKERFILE="alpine"
73+
- run: make test-image IMAGE="php:7.4-fpm-alpine3.15" DOCKERFILE="alpine"
74+
- run: make test-image IMAGE="php:7.4-fpm-buster" DOCKERFILE="buster"
8875

89-
- name: alpine-3.10
90-
run: make test-image IMAGE="php:7.4-fpm-alpine3.10" DOCKERFILE="alpine"
76+
test-80:
77+
runs-on: ubuntu-latest
78+
needs: lint
79+
steps:
9180

92-
- name: alpine-3.11
93-
run: make test-image IMAGE="php:7.4-fpm-alpine3.11" DOCKERFILE="alpine"
81+
- uses: actions/checkout@v2
82+
- run: make test-image IMAGE="php:8.0-fpm-alpine3.12" DOCKERFILE="alpine"
83+
- run: make test-image IMAGE="php:8.0-fpm-alpine3.13" DOCKERFILE="alpine"
84+
- run: make test-image IMAGE="php:8.0-fpm-alpine3.14" DOCKERFILE="alpine"
85+
- run: make test-image IMAGE="php:8.0-fpm-alpine3.15" DOCKERFILE="alpine"
86+
- run: make test-image IMAGE="php:8.0-fpm-buster" DOCKERFILE="buster"
87+
88+
test-81:
89+
runs-on: ubuntu-latest
90+
needs: lint
91+
steps:
9492

95-
- name: buster
96-
run: make test-image IMAGE="php:7.4-fpm-buster" DOCKERFILE="buster"
93+
- uses: actions/checkout@v2
94+
- run: make test-image IMAGE="php:8.1-fpm-alpine3.14" DOCKERFILE="alpine"
95+
- run: make test-image IMAGE="php:8.1-fpm-alpine3.15" DOCKERFILE="alpine"
96+
- run: make test-image IMAGE="php:8.1-fpm-buster" DOCKERFILE="buster"

‎Makefile‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,18 @@ lint: php-fpm-healthcheck ## Lint code
1010
./php-fpm-healthcheck ./test/*.sh
1111

1212
test: ## Test code in multiple images
13-
$(MAKE) test-image IMAGE="php:fpm-alpine" DOCKERFILE="alpine"
14-
$(MAKE) test-image IMAGE="php:fpm-buster" DOCKERFILE="buster"
15-
$(MAKE) test-image IMAGE="php:7.1-fpm-alpine3.7" DOCKERFILE="alpine"
16-
$(MAKE) test-image IMAGE="php:7.1-fpm-alpine3.8" DOCKERFILE="alpine"
17-
$(MAKE) test-image IMAGE="php:7.2-fpm-alpine3.7" DOCKERFILE="alpine"
18-
$(MAKE) test-image IMAGE="php:7.2-fpm-alpine3.8" DOCKERFILE="alpine"
19-
$(MAKE) test-image IMAGE="php:7.3-fpm-alpine3.8" DOCKERFILE="alpine"
20-
$(MAKE) test-image IMAGE="php:7.3-fpm-alpine3.9" DOCKERFILE="alpine"
21-
$(MAKE) test-image IMAGE="php:7.4-fpm-alpine3.10" DOCKERFILE="alpine"
22-
$(MAKE) test-image IMAGE="php:7.4-fpm-alpine3.11" DOCKERFILE="alpine"
13+
$(MAKE) test-image IMAGE="php:7.1-fpm-alpine" DOCKERFILE="alpine"
14+
$(MAKE) test-image IMAGE="php:7.2-fpm-alpine" DOCKERFILE="alpine"
15+
$(MAKE) test-image IMAGE="php:7.3-fpm-alpine" DOCKERFILE="alpine"
16+
$(MAKE) test-image IMAGE="php:7.4-fpm-alpine" DOCKERFILE="alpine"
17+
$(MAKE) test-image IMAGE="php:8.0-fpm-alpine" DOCKERFILE="alpine"
18+
$(MAKE) test-image IMAGE="php:8.1-fpm-alpine" DOCKERFILE="alpine"
2319
$(MAKE) test-image IMAGE="php:7.1-fpm-stretch" DOCKERFILE="stretch"
2420
$(MAKE) test-image IMAGE="php:7.2-fpm-stretch" DOCKERFILE="stretch"
2521
$(MAKE) test-image IMAGE="php:7.3-fpm-stretch" DOCKERFILE="stretch"
2622
$(MAKE) test-image IMAGE="php:7.4-fpm-buster" DOCKERFILE="buster"
23+
$(MAKE) test-image IMAGE="php:8.0-fpm-buster" DOCKERFILE="buster"
24+
$(MAKE) test-image IMAGE="php:8.1-fpm-buster" DOCKERFILE="buster"
2725

2826
test-image:
2927
./test/docker.sh ${DOCKERFILE} ${IMAGE}

0 commit comments

Comments
 (0)