Skip to content

Commit 8f01d38

Browse files
authored
Merge pull request #46 from devilbox/release-0.43
Unify workflows
2 parents 3844c2a + 0ffefc7 commit 8f01d38

File tree

5 files changed

+1
-20
lines changed

5 files changed

+1
-20
lines changed

.github/workflows/action_branch.yml

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
with:
2727
enabled: true
2828
can_deploy: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-') }}
29-
name: ${{ needs.params.outputs.name }}
3029
matrix: ${{ needs.params.outputs.matrix }}
3130
refs: ${{ needs.params.outputs.refs }}
3231
secrets:

.github/workflows/action_pull_request.yml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
with:
2929
enabled: true
3030
can_deploy: false
31-
name: ${{ needs.params.outputs.name }}
3231
matrix: ${{ needs.params.outputs.matrix }}
3332
refs: ${{ needs.params.outputs.refs }}
3433
secrets:

.github/workflows/action_schedule.yml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ jobs:
2828
with:
2929
enabled: true
3030
can_deploy: true
31-
name: ${{ needs.params.outputs.name }}
3231
matrix: ${{ needs.params.outputs.matrix }}
3332
refs: ${{ needs.params.outputs.refs }}
3433
secrets:

.github/workflows/params.yml

-16
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ name: params
1010
# Custom Variables
1111
# -------------------------------------------------------------------------------------------------
1212
env:
13-
NAME: Nginx
1413
MATRIX: >-
1514
[
1615
{
1716
"NAME": "Nginx",
1817
"VERSION": ["stable"],
1918
"ARCH": ["linux/amd64", "linux/386", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
20-
2119
}
2220
]
2321
@@ -28,9 +26,6 @@ env:
2826
on:
2927
workflow_call:
3028
outputs:
31-
name:
32-
description: "The project name"
33-
value: ${{ jobs.params.outputs.name }}
3429
matrix:
3530
description: "The determined version matrix"
3631
value: ${{ jobs.params.outputs.matrix }}
@@ -43,16 +38,10 @@ jobs:
4338
runs-on: ubuntu-latest
4439

4540
outputs:
46-
name: ${{ steps.set-name.outputs.name }}
4741
matrix: ${{ steps.set-matrix.outputs.matrix }}
4842
refs: ${{ steps.set-refs.outputs.matrix }}
4943

5044
steps:
51-
- name: "Set Name"
52-
id: set-name
53-
run: |
54-
echo '::set-output name=name::${{ env.NAME }}'
55-
5645
- name: "[Set-Output] Matrix"
5746
id: set-matrix
5847
run: |
@@ -69,11 +58,6 @@ jobs:
6958

7059
- name: "[DEBUG] Show settings'"
7160
run: |
72-
echo 'Name'
73-
echo '--------------------'
74-
echo '${{ steps.set-name.outputs.name }}'
75-
echo
76-
7761
echo 'Matrix'
7862
echo '--------------------'
7963
echo '${{ steps.set-matrix.outputs.matrix }}'

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TAG = latest
2626
# Makefile.docker overwrites
2727
NAME = Nginx
2828
VERSION = stable
29-
IMAGE = devilbox/nginx-stable
29+
IMAGE = devilbox/nginx-$(VERSION)
3030
DIR = .
3131
FILE = Dockerfile
3232
DOCKER_TAG = $(TAG)

0 commit comments

Comments
 (0)