Skip to content

Commit

Permalink
Merge pull request #43 from devilbox/release-0.43
Browse files Browse the repository at this point in the history
Unify workflows
  • Loading branch information
cytopia authored Mar 13, 2022
2 parents bc0f6b9 + 6f2d208 commit 33eb176
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 20 deletions.
1 change: 0 additions & 1 deletion .github/workflows/action_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
with:
enabled: true
can_deploy: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release-') }}
name: ${{ needs.params.outputs.name }}
matrix: ${{ needs.params.outputs.matrix }}
refs: ${{ needs.params.outputs.refs }}
secrets:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/action_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
with:
enabled: true
can_deploy: false
name: ${{ needs.params.outputs.name }}
matrix: ${{ needs.params.outputs.matrix }}
refs: ${{ needs.params.outputs.refs }}
secrets:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/action_schedule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jobs:
with:
enabled: true
can_deploy: true
name: ${{ needs.params.outputs.name }}
matrix: ${{ needs.params.outputs.matrix }}
refs: ${{ needs.params.outputs.refs }}
secrets:
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/params.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ name: params
# Custom Variables
# -------------------------------------------------------------------------------------------------
env:
NAME: Apache
MATRIX: >-
[
{
"NAME": "Apache",
"VERSION": ["2.2"],
"ARCH": ["linux/amd64", "linux/386", "linux/arm64", "linux/arm/v7", "linux/arm/v6"]
}
]
Expand All @@ -28,9 +26,6 @@ env:
on:
workflow_call:
outputs:
name:
description: "The project name"
value: ${{ jobs.params.outputs.name }}
matrix:
description: "The determined version matrix"
value: ${{ jobs.params.outputs.matrix }}
Expand All @@ -43,16 +38,10 @@ jobs:
runs-on: ubuntu-latest

outputs:
name: ${{ steps.set-name.outputs.name }}
matrix: ${{ steps.set-matrix.outputs.matrix }}
refs: ${{ steps.set-refs.outputs.matrix }}

steps:
- name: "Set Name"
id: set-name
run: |
echo '::set-output name=name::${{ env.NAME }}'
- name: "[Set-Output] Matrix"
id: set-matrix
run: |
Expand All @@ -69,11 +58,6 @@ jobs:

- name: "[DEBUG] Show settings'"
run: |
echo 'Name'
echo '--------------------'
echo '${{ steps.set-name.outputs.name }}'
echo
echo 'Matrix'
echo '--------------------'
echo '${{ steps.set-matrix.outputs.matrix }}'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ TAG = latest
# Makefile.docker overwrites
NAME = Apache
VERSION = 2.2
IMAGE = devilbox/apache-2.2
IMAGE = devilbox/apache-$(VERSION)
DIR = .
FILE = Dockerfile
DOCKER_TAG = $(TAG)
Expand Down

0 comments on commit 33eb176

Please sign in to comment.