Skip to content

Commit f89e42c

Browse files
cytopiacytopia
authored
Merge pull request #20 from devilbox/release-0.1.32
Distinguish between flavour and stage
2 parents 526a0ce + 65d0ba0 commit f89e42c

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎.github/workflows/docker-multistage-build.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ on:
1111
description: 'The build matrix'
1212
required: true
1313
type: string
14-
flavour:
15-
description: 'The flavour to build (Examples: base, mods, prod or work).'
14+
stage:
15+
description: 'The stage to build (Examples: base, mods, prod or work).'
1616
required: true
1717
type: string
18-
flavour_prev:
19-
description: 'The previous flavour (used for downloading previous artifact).'
18+
stage_prev:
19+
description: 'The previous stage (used for downloading previous artifact).'
2020
required: true
2121
type: string
2222
artifact_prefix:
@@ -41,7 +41,7 @@ jobs:
4141
# JOB: BUILD
4242
# -----------------------------------------------------------------------------------------------
4343
build:
44-
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.flavour }} (${{ matrix.arch }}) ${{ matrix.refs }}
44+
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.stage }} (${{ matrix.arch }}) ${{ matrix.refs }}
4545
runs-on: ubuntu-latest
4646
strategy:
4747
fail-fast: false
@@ -78,8 +78,8 @@ jobs:
7878
VERSION="${{ matrix.version }}"
7979
ARCH="$( echo "${{ matrix.arch }}" | sed 's|/|-|g' )"
8080
81-
NAME_PREV="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.flavour_prev }}"
82-
NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.flavour }}"
81+
NAME_PREV="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage_prev }}"
82+
NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage }}"
8383
echo "::set-output name=prev::${NAME_PREV}"
8484
echo "::set-output name=curr::${NAME_CURR}"
8585
@@ -99,14 +99,14 @@ jobs:
9999
name: ${{ steps.set-artifact-name.outputs.prev }}
100100
attempt_limit: 20
101101
attempt_delay: 10000
102-
if: ${{ inputs.flavour_prev != '' }}
102+
if: ${{ inputs.stage_prev != '' }}
103103

104104
- name: "[Artifact Load] Import previously built image"
105105
uses: cytopia/[email protected]
106106
with:
107107
command: |
108108
make load INFILE=${{ steps.set-artifact-name.outputs.prev }}
109-
if: ${{ inputs.flavour_prev != '' }}
109+
if: ${{ inputs.stage_prev != '' }}
110110

111111

112112
# ------------------------------------------------------------
@@ -116,7 +116,7 @@ jobs:
116116
uses: cytopia/[email protected]
117117
with:
118118
command: |
119-
make build VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} ARCH=${{ matrix.arch }}
119+
make build VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }}
120120
121121
122122
# ------------------------------------------------------------
@@ -126,7 +126,7 @@ jobs:
126126
uses: cytopia/[email protected]
127127
with:
128128
command: |
129-
make test VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} ARCH=${{ matrix.arch }}
129+
make test VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }}
130130
if: ${{ inputs.run_tests }}
131131

132132

@@ -141,7 +141,7 @@ jobs:
141141
uses: cytopia/[email protected]
142142
with:
143143
command: |
144-
make save-verify VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} ARCH=${{ matrix.arch }} OUTFILE=${{ steps.set-artifact-name.outputs.curr }} INFILE=${{ steps.set-artifact-name.outputs.curr }}
144+
make save-verify VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }} OUTFILE=${{ steps.set-artifact-name.outputs.curr }} INFILE=${{ steps.set-artifact-name.outputs.curr }}
145145
if: ${{ inputs.upload_artifact }}
146146

147147
###

‎.github/workflows/docker-multistage-push-image.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
description: 'The build matrix'
1212
required: true
1313
type: string
14-
flavour:
15-
description: 'The flavour to build (Examples: base, mods, prod or work).'
14+
stage:
15+
description: 'The stage to build (Examples: base, mods, prod or work).'
1616
required: true
1717
type: string
1818
artifact_prefix:
@@ -43,7 +43,7 @@ jobs:
4343
# JOB: DEPLOY
4444
# -----------------------------------------------------------------------------------------------
4545
test:
46-
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.flavour }} (${{ matrix.arch }}) ${{ matrix.refs }}
46+
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.stage }} (${{ matrix.arch }}) ${{ matrix.refs }}
4747
runs-on: ubuntu-latest
4848
strategy:
4949
fail-fast: false
@@ -84,7 +84,7 @@ jobs:
8484
VERSION="${{ matrix.version }}"
8585
ARCH="$( echo "${{ matrix.arch }}" | sed 's|/|-|g' )"
8686
87-
NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.flavour }}"
87+
NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage }}"
8888
echo "::set-output name=curr::${NAME_CURR}"
8989
9090
@@ -118,7 +118,7 @@ jobs:
118118
uses: cytopia/[email protected]
119119
with:
120120
command: |
121-
make tag VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}
121+
make tag VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}
122122
123123
- name: "[Docker Tag] Show images"
124124
run: |
@@ -143,5 +143,5 @@ jobs:
143143
uses: cytopia/[email protected]
144144
with:
145145
command: |
146-
make push VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}
146+
make push VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}
147147
if: ${{ inputs.can_deploy }}

‎.github/workflows/docker-multistage-push-manifest.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ on:
1414
description: 'The build matrix set via params.yml.'
1515
required: true
1616
type: string
17-
flavour:
18-
description: 'The flavour to build (Examples: base, mods, prod or work).'
17+
stage:
18+
description: 'The stage to build (Examples: base, mods, prod or work).'
1919
required: true
2020
type: string
2121
can_deploy:
@@ -43,7 +43,7 @@ jobs:
4343
# JOB (3/3): DEPLOY
4444
# -----------------------------------------------------------------------------------------------
4545
deploy:
46-
name: ${{ matrix.name }}-${{ matrix.version }} (${{ matrix.flavour }}) ${{ matrix.refs }}
46+
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.stage }} ${{ matrix.refs }}
4747
runs-on: ubuntu-latest
4848
strategy:
4949
fail-fast: false
@@ -107,7 +107,7 @@ jobs:
107107
uses: cytopia/[email protected]
108108
with:
109109
command: |
110-
make manifest-create VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}
110+
make manifest-create VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCHES=${{ steps.manifest.outputs.arches }} TAG=${{ steps.tag.outputs.docker-tag }}
111111
112112
113113
# ------------------------------------------------------------
@@ -117,4 +117,4 @@ jobs:
117117
uses: cytopia/[email protected]
118118
with:
119119
command: |
120-
make manifest-push VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}
120+
make manifest-push VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} TAG=${{ steps.tag.outputs.docker-tag }}

‎.github/workflows/docker-multistage-test.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ on:
1111
description: 'The build matrix'
1212
required: true
1313
type: string
14-
flavour:
15-
description: 'The flavour to build (Examples: base, mods, prod or work).'
14+
stage:
15+
description: 'The stage to build (Examples: base, mods, prod or work).'
1616
required: true
1717
type: string
1818
artifact_prefix:
@@ -29,7 +29,7 @@ jobs:
2929
# JOB: BUILD
3030
# -----------------------------------------------------------------------------------------------
3131
test:
32-
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.flavour }} (${{ matrix.arch }}) ${{ matrix.refs }}
32+
name: ${{ matrix.name }}-${{ matrix.version }}-${{ inputs.stage }} (${{ matrix.arch }}) ${{ matrix.refs }}
3333
runs-on: ubuntu-latest
3434
strategy:
3535
fail-fast: false
@@ -66,7 +66,7 @@ jobs:
6666
VERSION="${{ matrix.version }}"
6767
ARCH="$( echo "${{ matrix.arch }}" | sed 's|/|-|g' )"
6868
69-
NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.flavour }}"
69+
NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage }}"
7070
echo "::set-output name=curr::${NAME_CURR}"
7171
7272
@@ -100,4 +100,4 @@ jobs:
100100
uses: cytopia/[email protected]
101101
with:
102102
command: |
103-
make test VERSION=${{ matrix.version }} FLAVOUR=${{ inputs.flavour }} ARCH=${{ matrix.arch }}
103+
make test VERSION=${{ matrix.version }} STAGE=${{ inputs.stage }} FLAVOUR=${{ matrix.flavour }} ARCH=${{ matrix.arch }}

0 commit comments

Comments
 (0)