From 0d7d6af55b8207cfdb3ba6abff5959bd1292dca8 Mon Sep 17 00:00:00 2001
From: Richard Kuo <rkuo@rkuo.com>
Date: Mon, 4 Nov 2024 22:47:20 -0800
Subject: [PATCH] try using the basic template at
 https://github.com/helm/chart-releaser-action

---
 .github/workflows/dev-pr-merge.yaml           | 42 -------------------
 .../workflows/push-release-helm-charts.yaml   | 39 +++++++++++++++++
 charts/vespa/Chart.yaml                       |  2 +-
 3 files changed, 40 insertions(+), 43 deletions(-)
 delete mode 100644 .github/workflows/dev-pr-merge.yaml
 create mode 100644 .github/workflows/push-release-helm-charts.yaml

diff --git a/.github/workflows/dev-pr-merge.yaml b/.github/workflows/dev-pr-merge.yaml
deleted file mode 100644
index 50c14ba..0000000
--- a/.github/workflows/dev-pr-merge.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Merge with develop branch
-
-on:
-  pull_request:
-    types: [closed]
-    branches:
-      - main
-
-      
-jobs:
-  dev-pr-merge:
-    permissions: write-all
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout our repository
-      uses: actions/checkout@v2
-      with:
-        ref: main
-        fetch-depth: 0 
-    - name: Configure Git
-      run: |
-        git config user.name "$GITHUB_ACTOR"
-        git config user.email "$GITHUB_ACTOR@users.noreply.github.com"          
-    - name: Release Please
-      id: release_action_plan
-      uses: google-github-actions/release-please-action@v4
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        config-file: .github/configuration/release-please-config.json
-        manifest-file: .github/configuration/release-please-manifest.json
-    - name: Install Helm
-      uses: azure/setup-helm@v3
-
-    - name: Run chart-releaser
-      if: steps.release_action_plan.outputs.releases_created == 'true'
-      uses: helm/chart-releaser-action@v1.6.0
-      with:
-        charts_dir: charts
-        skip_upload: false
-      env:
-        CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" 
\ No newline at end of file
diff --git a/.github/workflows/push-release-helm-charts.yaml b/.github/workflows/push-release-helm-charts.yaml
new file mode 100644
index 0000000..dfab112
--- /dev/null
+++ b/.github/workflows/push-release-helm-charts.yaml
@@ -0,0 +1,39 @@
+name: Release Helm Charts
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:  # Allows manual triggering
+      
+jobs:
+  release-helm-charts:
+    permissions:
+      contents: write
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        ref: main
+        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@v4
+      env:
+        GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+    # https://github.com/helm/chart-releaser-action
+    - name: Run chart-releaser
+      uses: helm/chart-releaser-action@v1.6.0
+      with:
+        charts_dir: charts
+        skip_upload: false
+      env:
+        CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" 
\ No newline at end of file
diff --git a/charts/vespa/Chart.yaml b/charts/vespa/Chart.yaml
index 1ea383c..3af9c5c 100644
--- a/charts/vespa/Chart.yaml
+++ b/charts/vespa/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.3
+version: 0.2.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to