From 6f2d208c591e2d0923877deb491665fa924bc736 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sun, 13 Mar 2022 13:38:06 +0100
Subject: [PATCH] Unify workflows

---
 .github/workflows/action_branch.yml       |  1 -
 .github/workflows/action_pull_request.yml |  1 -
 .github/workflows/action_schedule.yml     |  1 -
 .github/workflows/params.yml              | 16 ----------------
 Makefile                                  |  2 +-
 5 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/.github/workflows/action_branch.yml b/.github/workflows/action_branch.yml
index b102724..55d6950 100644
--- a/.github/workflows/action_branch.yml
+++ b/.github/workflows/action_branch.yml
@@ -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:
diff --git a/.github/workflows/action_pull_request.yml b/.github/workflows/action_pull_request.yml
index a4e3e96..c80bf78 100644
--- a/.github/workflows/action_pull_request.yml
+++ b/.github/workflows/action_pull_request.yml
@@ -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:
diff --git a/.github/workflows/action_schedule.yml b/.github/workflows/action_schedule.yml
index 80d3d38..36d979a 100644
--- a/.github/workflows/action_schedule.yml
+++ b/.github/workflows/action_schedule.yml
@@ -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:
diff --git a/.github/workflows/params.yml b/.github/workflows/params.yml
index 81c480f..62d7923 100644
--- a/.github/workflows/params.yml
+++ b/.github/workflows/params.yml
@@ -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"]
-
       }
     ]
 
@@ -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 }}
@@ -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: |
@@ -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 }}'
diff --git a/Makefile b/Makefile
index f524fe0..fa32498 100644
--- a/Makefile
+++ b/Makefile
@@ -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)