From 6343bdc2c7e09f28bb2c55fd0a5b5315f20fc098 Mon Sep 17 00:00:00 2001
From: Richard87 <richard.hagen@gmail.com>
Date: Fri, 11 Oct 2024 10:16:36 +0200
Subject: [PATCH] fix cleanup workflow

---
 .github/workflows/build-container.yaml | 29 +++++++++++++++++++-
 .github/workflows/build-helm.yaml      | 37 --------------------------
 2 files changed, 28 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/build-helm.yaml

diff --git a/.github/workflows/build-container.yaml b/.github/workflows/build-container.yaml
index ae5c9d0..5cf5f3c 100644
--- a/.github/workflows/build-container.yaml
+++ b/.github/workflows/build-container.yaml
@@ -11,7 +11,7 @@ on:
 jobs:
 
   build-container-image:
-    name: Build Helm chart
+    name: Build container image
     runs-on: ubuntu-latest
     env:
       REGISTRY: ghcr.io
@@ -52,3 +52,30 @@ jobs:
           platforms: |
             linux/amd64
             linux/arm64
+
+
+  build-helm-chart:
+    name: Build Helm chart
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
+
+      - name: Install Helm
+        uses: azure/setup-helm@v3
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.6.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/build-helm.yaml b/.github/workflows/build-helm.yaml
deleted file mode 100644
index ad45a43..0000000
--- a/.github/workflows/build-helm.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Build Helm Chart
-
-on:
-  release:
-    types: [created]
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-
-  build-helm-chart:
-    name: Build container image
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-      - name: Install Helm
-        uses: azure/setup-helm@v3
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"