From f9418d79cdefc9399628cf7b0d18b73987c33b7f Mon Sep 17 00:00:00 2001
From: webcoderz <19884161+webcoderz@users.noreply.github.com>
Date: Wed, 2 Aug 2023 01:32:03 -0400
Subject: [PATCH 1/2] Update release.yaml

Moved main helm chart releaser to the bottom so it can pick up the bundle chart releases and put in the helm repo
---
 .github/workflows/release.yaml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 6984fb7..d98e8d9 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -30,14 +30,6 @@ jobs:
         run: |
           echo "TAG_NAME=$(cat charts/graphistry-helm/Chart.yaml | yq .version)" >> $GITHUB_ENV
 
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        with:
-          charts_dir: charts
-          config: .github/config/chart-releaser.yaml
-
       - name: get aux charts for release
         env:
           AUX_BUNDLE_DIR: Bundle-Charts-Release-${{ env.TAG_NAME }}
@@ -50,3 +42,10 @@ jobs:
         run: |
           gh release create Bundle-Charts-Release-${{ env.TAG_NAME }} Bundle-Charts-Release-${{ env.TAG_NAME }}.tgz
 
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.5.0
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        with:
+          charts_dir: charts
+          config: .github/config/chart-releaser.yaml

From 0b80f656c9574b9f45c5950811b272e9463a49ad Mon Sep 17 00:00:00 2001
From: webcoderz <19884161+webcoderz@users.noreply.github.com>
Date: Wed, 2 Aug 2023 01:36:57 -0400
Subject: [PATCH 2/2] Update release.yaml

Fixing naming of bundle charts to match our naming schema
---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index d98e8d9..2078f30 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -32,7 +32,7 @@ jobs:
 
       - name: get aux charts for release
         env:
-          AUX_BUNDLE_DIR: Bundle-Charts-Release-${{ env.TAG_NAME }}
+          AUX_BUNDLE_DIR: Bundle-Charts-${{ env.TAG_NAME }}
         run: bash chart-bundler/bundler.sh 
 
       - name: Creates a release in GitHub and uploads attachments
@@ -40,7 +40,7 @@ jobs:
           GITHUB_TOKEN: ${{  secrets.GITHUB_TOKEN  }}
         shell: bash
         run: |
-          gh release create Bundle-Charts-Release-${{ env.TAG_NAME }} Bundle-Charts-Release-${{ env.TAG_NAME }}.tgz
+          gh release create Bundle-Charts-${{ env.TAG_NAME }} Bundle-Charts-${{ env.TAG_NAME }}.tgz
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.5.0