From 7ef54ab7fe32f2fe3723f823e7bafbf6b80d84dd Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Wed, 9 Nov 2022 12:37:41 +0100
Subject: [PATCH] Revert multi-stage build

---
 .github/workflows/docker-multistage-build.yml | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/docker-multistage-build.yml b/.github/workflows/docker-multistage-build.yml
index 79728c0..c88adbf 100644
--- a/.github/workflows/docker-multistage-build.yml
+++ b/.github/workflows/docker-multistage-build.yml
@@ -23,16 +23,6 @@ on:
         description: 'Unique artifact name prefix (to avoid overriding existing artifcats during parallel runs).'
         required: true
         type: string
-      artifact_prev_name_add_version:
-        description: 'Add version to artifact name to download.'
-        required: false
-        default: true
-        type: boolean
-      artifact_curr_name_add_version:
-        description: 'Add version to artifact name to upload.'
-        required: false
-        default: true
-        type: boolean
       has_refs:
         description: 'The ref build matrix as JSON string (list of git refs to build/deploy).'
         required: true
@@ -98,18 +88,10 @@ jobs:
           VERSION="${{ matrix.version }}"
           ARCH="$( echo "${{ matrix.arch }}" | sed 's|/|-|g' )"
 
-          if [ "${{ inputs.artifact_prev_name_add_version }}" = "true" ]; then
-            NAME_PREV="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage_prev }}"
-          else
-            NAME_PREV="${{ inputs.artifact_prefix }}-${PRE_HASH}-${ARCH}-${{ inputs.stage_prev }}"
-          fi
-          if [ "${{ inputs.artifact_curr_name_add_version }}" = "true" ]; then
-            NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage }}"
-          else
-            NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${ARCH}-${{ inputs.stage }}"
-          fi
-          echo "::set-output name=prev::${NAME_PREV}"
-          echo "::set-output name=curr::${NAME_CURR}"
+          NAME_PREV="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage_prev }}"
+          NAME_CURR="${{ inputs.artifact_prefix }}-${PRE_HASH}-${VERSION}-${ARCH}-${{ inputs.stage }}"
+          echo "prev::${NAME_PREV}" >> $GITHUB_OUTPUT
+          echo "curr::${NAME_CURR}" >> $GITHUB_OUTPUT
 
       - name: "[DEBUG] Show setup"
         shell: bash