From 522a67c8e73fe2d95fcaf4a7bc864170c8e3417a Mon Sep 17 00:00:00 2001
From: Alastair Pitts <alastair.pitts@octopus.com>
Date: Tue, 1 Oct 2024 12:16:43 +1000
Subject: [PATCH] Only apply revision to main builds

---
 .github/workflows/build-and-publish-container-image.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-and-publish-container-image.yml b/.github/workflows/build-and-publish-container-image.yml
index 2ece3c9..ac0a48d 100644
--- a/.github/workflows/build-and-publish-container-image.yml
+++ b/.github/workflows/build-and-publish-container-image.yml
@@ -98,11 +98,12 @@ jobs:
           if [[ "${{steps.branch_names.outputs.branch_name}}" != "main" ]]
             then
             preRelease="-${{steps.branch_names.outputs.branch_name}}-$(date +'%Y%m%d%H%M%S')"
+          else
+            revision="-${{ needs.versions.outputs.revision }}"
           fi
 
-          revision="-${{ needs.versions.outputs.revision }}"
-
           tagVersion="$kubernetesVersion$revision$preRelease";
+          
           echo "tagVersion=$tagVersion" >> $GITHUB_OUTPUT;
           echo "tagVersion=$tagVersion";