From 37abb782d4413bbbc76ac4b4b9e503adc2b5bedd Mon Sep 17 00:00:00 2001
From: Andrei Stefanie <andrei.stefanie@cyscale.com>
Date: Mon, 5 Aug 2024 18:12:33 +0300
Subject: [PATCH] fix: try to use semrel also for CR

---
 .github/workflows/release.yml | 32 ++++++++++----------------------
 .releaserc.json               |  6 ++++--
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a4a1819..fdd1765 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,41 +6,29 @@ on:
       - main
 
 jobs:
-  semrel:
-    name: Chart Versioning
+  release:
+    name: Release
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      pull-requests: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           persist-credentials: false
+      - 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@v4.2.0
       - name: Generate the next version
         uses: cycjimmy/semantic-release-action@v4
         id: release
         with:
-          dry_run: true
           extra_plugins: |
             @semantic-release/git
-            semantic-release-helm
+            semantic-release-helm3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    needs: semrel
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - 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@v4.2.0
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.6.0
-        env:
-          CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.releaserc.json b/.releaserc.json
index a9f57ce..4cce050 100644
--- a/.releaserc.json
+++ b/.releaserc.json
@@ -27,9 +27,11 @@
       }
     ],
     [
-      "semantic-release-helm",
+      "semantic-release-helm3",
       {
-        "chartPath": "./charts/kubernetes-agent"
+        "chartPath": "./charts/kubernetes-agent",
+        "onlyUpdateVersion": true,
+        "crPublish": true
       }
     ],
     [