From b5f9baa17d0961ae20a7786a479fcdc76c0ed95f Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Mon, 2 Jan 2023 22:06:27 +1300
Subject: [PATCH] Separating meta for release vs edge

---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 323cc68d..7587cf49 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
 
       - name: Generating release tags and labels
         if: github.event_name == 'release'
-        id: meta
+        id: release_meta
         uses: docker/metadata-action@v4
         with:
           images: jaedb/iris
@@ -146,9 +146,9 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
 
-      - name: Generating branch labels
+      - name: Generating edge branch labels
         if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master'
-        id: meta
+        id: edge_meta
         uses: docker/metadata-action@v4
         with:
           images: jaedb/iris
@@ -164,5 +164,5 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          tags: ${{ steps.release_meta.outputs.tags || steps.edge_meta.outputs.tags }}
+          labels: ${{ steps.release_meta.outputs.labels || steps.edge_meta.outputs.tags }}