From c3a45e8983b8ba7742d9082783453851caedcbcc Mon Sep 17 00:00:00 2001
From: Michael Richardson <michael.richardson@hey.com>
Date: Sat, 4 Nov 2023 12:09:48 +1000
Subject: [PATCH] get simple branch name

---
 .github/workflows/release-pull-request.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-pull-request.yml b/.github/workflows/release-pull-request.yml
index ccfb878..87fc25b 100644
--- a/.github/workflows/release-pull-request.yml
+++ b/.github/workflows/release-pull-request.yml
@@ -26,6 +26,9 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Get branch name
+        id: branch-name
+        uses: tj-actions/branch-names@v7
 
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
@@ -56,16 +59,11 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}.${{ github.run_id }}
+          tags: ${{ steps.branch-name.outputs.current_branch }}.${{ github.run_id }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: echo tag
-        run: echo "$IMAGE_TAG"
-        env:
-          IMAGE_TAG: ${{ steps.meta.outputs.tags }}
-
       - name: Login to Octopus
         uses: OctopusDeploy/login@v1
         with:
@@ -77,4 +75,4 @@ jobs:
         with:
           project: 'SHIPPED23'
           release_number: ${{ steps.meta.outputs.tags }}
-          package_version: ${{ steps.meta.outputs.tags }}.${{ github.run_id }}
+          package_version: ${{ steps.branch-name.outputs.current_branch }}.${{ github.run_id }}