From 198f634f91e72c05820dfecf5f18d08602d909c2 Mon Sep 17 00:00:00 2001
From: rasswanth-s <43314053+rasswanth-s@users.noreply.github.com>
Date: Tue, 30 Jul 2024 11:53:14 +0530
Subject: [PATCH] fix helm package overwrite

---
 .github/workflows/cd-feature-branch.yml | 6 +++---
 .github/workflows/cd-syft.yml           | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cd-feature-branch.yml b/.github/workflows/cd-feature-branch.yml
index cab49a481f0..a77ea3724cb 100644
--- a/.github/workflows/cd-feature-branch.yml
+++ b/.github/workflows/cd-feature-branch.yml
@@ -367,15 +367,15 @@ jobs:
 
       - name: Copy helm repo files from Syft Repo
         run: |
-          rm -rf ghpages/helm/*
-          cp -R packages/grid/helm/repo/. ghpages/helm/
+          cp packages/grid/helm/repo/index.yaml ghpages/helm/
+          cp packages/grid/helm/repo/syft-${{ needs.merge-docker-images.outputs.server_version  }}.tgz ghpages/helm/
 
       - name: Commit changes to gh-pages
         uses: EndBug/add-and-commit@v9
         with:
           author_name: ${{ secrets.OM_BOT_NAME }}
           author_email: ${{ secrets.OM_BOT_EMAIL }}
-          message: "Update Helm package from Syft Repo"
+          message: "Add Helm package for Syft Version: ${{ needs.merge-docker-images.outputs.server_version }}"
           add: "helm/"
           push: "origin gh-pages"
           cwd: "./ghpages/"
diff --git a/.github/workflows/cd-syft.yml b/.github/workflows/cd-syft.yml
index 6725ef782ce..bd884432bde 100644
--- a/.github/workflows/cd-syft.yml
+++ b/.github/workflows/cd-syft.yml
@@ -578,15 +578,15 @@ jobs:
 
       - name: Copy helm repo files from Syft Repo
         run: |
-          rm -rf ghpages/helm/*
-          cp -R packages/grid/helm/repo/. ghpages/helm/
+          cp packages/grid/helm/repo/index.yaml ghpages/helm/
+          cp packages/grid/helm/repo/syft-${{ steps.release_checks.outputs.syft_version }}.tgz ghpages/helm/
 
       - name: Commit changes to gh-pages
         uses: EndBug/add-and-commit@v9
         with:
           author_name: ${{ secrets.OM_BOT_NAME }}
           author_email: ${{ secrets.OM_BOT_EMAIL }}
-          message: "Update Helm package from Syft Repo"
+          message: "Add Helm package for Syft Version: ${{ steps.release_checks.outputs.syft_version }}"
           add: "helm/"
           push: "origin gh-pages"
           cwd: "./ghpages/"