Skip to content

Commit b51e640

Browse files
cytopiacytopia
committed
Distinguish between flavour and stage
1 parent d8eccbf commit b51e640

1 file changed

Lines changed: 65 additions & 31 deletions

File tree

‎.github/workflows/action_branch.yml‎

Lines changed: 65 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,24 @@ jobs:
4949
uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
5050
with:
5151
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
52-
run_tests: true
52+
run_tests: false
5353
upload_artifact: true
5454
matrix: ${{ needs.configure.outputs.matrix_build }}
5555
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
56-
flavour: base
57-
flavour_prev: ''
56+
stage: base
57+
stage_prev: ''
58+
59+
base-test:
60+
needs:
61+
- configure
62+
- base
63+
uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
64+
with:
65+
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
66+
matrix: ${{ needs.configure.outputs.matrix_build }}
67+
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
68+
stage: base
69+
5870

5971
# -----------------------------------------------------------------------------------------------
6072
# (4/8) Build & Test mods
@@ -70,8 +82,8 @@ jobs:
7082
upload_artifact: true
7183
matrix: ${{ needs.configure.outputs.matrix_build }}
7284
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
73-
flavour: mods
74-
flavour_prev: base
85+
stage: mods
86+
stage_prev: base
7587

7688
mods-test:
7789
needs:
@@ -82,7 +94,7 @@ jobs:
8294
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
8395
matrix: ${{ needs.configure.outputs.matrix_build }}
8496
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
85-
flavour: mods
97+
stage: mods
8698

8799

88100
# -----------------------------------------------------------------------------------------------
@@ -95,12 +107,23 @@ jobs:
95107
uses: devilbox/github-actions/.github/workflows/docker-multistage-build.yml@master
96108
with:
97109
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
98-
run_tests: true
110+
run_tests: false
99111
upload_artifact: true
100112
matrix: ${{ needs.configure.outputs.matrix_build }}
101113
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
102-
flavour: prod
103-
flavour_prev: mods
114+
stage: prod
115+
stage_prev: mods
116+
117+
prod-test:
118+
needs:
119+
- configure
120+
- prod
121+
uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
122+
with:
123+
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
124+
matrix: ${{ needs.configure.outputs.matrix_build }}
125+
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
126+
stage: prod
104127

105128

106129
# -----------------------------------------------------------------------------------------------
@@ -117,8 +140,19 @@ jobs:
117140
upload_artifact: true
118141
matrix: ${{ needs.configure.outputs.matrix_build }}
119142
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
120-
flavour: work
121-
flavour_prev: prod
143+
stage: work
144+
stage_prev: prod
145+
146+
work-test:
147+
needs:
148+
- configure
149+
- work
150+
uses: devilbox/github-actions/.github/workflows/docker-multistage-test.yml@master
151+
with:
152+
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
153+
matrix: ${{ needs.configure.outputs.matrix_build }}
154+
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
155+
stage: work
122156

123157

124158
# -----------------------------------------------------------------------------------------------
@@ -127,71 +161,71 @@ jobs:
127161
push-base:
128162
needs:
129163
- configure
130-
- base
164+
- base-test
131165
- mods-test
132-
- prod
133-
- work
166+
- prod-test
167+
- work-test
134168
uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
135169
with:
136170
can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
137171
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
138172
matrix: ${{ needs.configure.outputs.matrix_build }}
139173
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
140-
flavour: base
174+
stage: base
141175
secrets:
142176
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
143177
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
144178

145179
push-mods:
146180
needs:
147181
- configure
148-
- base
182+
- base-test
149183
- mods-test
150-
- prod
151-
- work
184+
- prod-test
185+
- work-test
152186
uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
153187
with:
154188
can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
155189
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
156190
matrix: ${{ needs.configure.outputs.matrix_build }}
157191
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
158-
flavour: mods
192+
stage: mods
159193
secrets:
160194
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
161195
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
162196

163197
push-prod:
164198
needs:
165199
- configure
166-
- base
200+
- base-test
167201
- mods-test
168-
- prod
169-
- work
202+
- prod-test
203+
- work-test
170204
uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
171205
with:
172206
can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
173207
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
174208
matrix: ${{ needs.configure.outputs.matrix_build }}
175209
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
176-
flavour: prod
210+
stage: prod
177211
secrets:
178212
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
179213
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
180214

181215
push-work:
182216
needs:
183217
- configure
184-
- base
218+
- base-test
185219
- mods-test
186-
- prod
187-
- work
220+
- prod-test
221+
- work-test
188222
uses: devilbox/github-actions/.github/workflows/docker-multistage-push-image.yml@master
189223
with:
190224
can_deploy: ${{ needs.configure.outputs.can_login == 'true' && needs.configure.outputs.can_push == 'true' }}
191225
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
192226
matrix: ${{ needs.configure.outputs.matrix_build }}
193227
artifact_prefix: ${{ needs.configure.outputs.artifact_prefix }}
194-
flavour: work
228+
stage: work
195229
secrets:
196230
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
197231
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -210,7 +244,7 @@ jobs:
210244
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
211245
matrix: ${{ needs.configure.outputs.matrix_deploy }}
212246
versions: ${{ needs.configure.outputs.versions }}
213-
flavour: base
247+
stage: base
214248
secrets:
215249
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
216250
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -225,7 +259,7 @@ jobs:
225259
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
226260
matrix: ${{ needs.configure.outputs.matrix_deploy }}
227261
versions: ${{ needs.configure.outputs.versions }}
228-
flavour: mods
262+
stage: mods
229263
secrets:
230264
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
231265
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -240,7 +274,7 @@ jobs:
240274
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
241275
matrix: ${{ needs.configure.outputs.matrix_deploy }}
242276
versions: ${{ needs.configure.outputs.versions }}
243-
flavour: prod
277+
stage: prod
244278
secrets:
245279
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
246280
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
@@ -255,7 +289,7 @@ jobs:
255289
has_refs: ${{ needs.configure.outputs.has_refs == 'true' }}
256290
matrix: ${{ needs.configure.outputs.matrix_deploy }}
257291
versions: ${{ needs.configure.outputs.versions }}
258-
flavour: work
292+
stage: work
259293
secrets:
260294
dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
261295
dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}

0 commit comments

Comments
 (0)