From 5ed31a4f06b4014d3e62015cfcece6141ca60e27 Mon Sep 17 00:00:00 2001
From: "Ware, Joseph (DLSLtd,RAL,LSCI)" <joseph.ware@diamond.ac.uk>
Date: Wed, 29 Jan 2025 16:33:31 +0000
Subject: [PATCH] Push image and make Helm chart only on tags

---
 .github/workflows/publish-image.yml | 7 ++++++-
 CHANGELOG.md                        | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
index bbca7fa9d..ba995832c 100644
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -47,7 +47,7 @@ jobs:
         with:
           context: .
           file: Dockerfile
-          push: true
+          push: startsWith(github.ref, 'refs/tags/')
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
@@ -56,6 +56,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
         id: install
+        if: startsWith(github.ref, 'refs/tags/')
 
       - name: Log in to the Chart registry
         run: |
@@ -65,4 +66,8 @@ jobs:
         run: |
           helm dependencies update helm/tiled
           helm package helm/tiled --version ${{ steps.meta.outputs.version }} --app-version ${{ steps.meta.outputs.version }} -d /tmp/
+
+      - name: Publish Helm chart
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
           helm push /tmp/tiled-${{ steps.meta.outputs.version }}.tgz oci://ghcr.io/bluesky/charts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 972b30888..a7eacc11c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ Write the date in place of the "Unreleased" in the case a new version is release
   mode in the `AboutAuthenticationProvider` schema to be `internal`|`external`.
   Python clients older than v0.1.0b17 will be sent `password` for back-compat.
 - Improved type hinting and efficiency of caching singleton values
+- Publish Container image and Helm chart only during a tagged release.
 
 ## v0.1.0-b16 (2024-01-23)