From fc531ee59cd7a1f56422d42b9ec92993ed834471 Mon Sep 17 00:00:00 2001
From: "Ryan (hackercat)" <me@hackerc.at>
Date: Fri, 25 Jun 2021 13:45:23 +0000
Subject: [PATCH] fix: push non-versioned tags (#16)

---
 .github/workflows/build-ubuntu.yml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 7ade64b..9c0b011 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -141,7 +141,6 @@ jobs:
       - name: Build and push ${{ env.SLUG }}:${{ env.TAG }}
         if: ${{ ( github.event_name != 'pull_request' && !env.ACT ) }}
         run: ./build.sh
-        shell: sh
         env:
           TAG: runner-${{ matrix.TAG }}
           TYPE: runner
@@ -215,7 +214,19 @@ jobs:
           TAG: ${{ matrix.TYPE }}-${{ matrix.TAG }}-${{ env.PART_TAG }}
           TYPE: ${{ matrix.TYPE }}
           FROM_IMAGE: ghcr.io/${{ env.SLUG }}
-          FROM_TAG: act-${{ matrix.TAG }}
+          FROM_TAG: act-${{ matrix.TAG }}-${{ env.PART_TAG }}
+          DISTRO: ${{ env.IMAGE }}
+          BUILD_TAG_VERSION: ${{ env.PART_TAG }}
+          BUILD_TAG: ${{ matrix.TYPE }}-${{ matrix.TAG }}
+
+      - name: Build and push ${{ env.SLUG }}:${{ env.TAG }}
+        run: ./build.sh
+        if: ${{ ( github.event_name != 'pull_request' && !env.ACT ) }}
+        env:
+          TAG: ${{ matrix.TYPE }}-${{ matrix.TAG }}
+          TYPE: ${{ matrix.TYPE }}
+          FROM_IMAGE: ghcr.io/${{ env.SLUG }}
+          FROM_TAG: act-${{ matrix.TAG }}-${{ env.PART_TAG }}
           DISTRO: ${{ env.IMAGE }}
           BUILD_TAG_VERSION: ${{ env.PART_TAG }}
           BUILD_TAG: ${{ matrix.TYPE }}-${{ matrix.TAG }}