From a036f0a939a47b6e41a5b7ea8fa8352dcf11de02 Mon Sep 17 00:00:00 2001
From: Carmine Vassallo <carmine.vassallo@sonarsource.com>
Date: Tue, 12 Nov 2024 09:06:50 +0100
Subject: [PATCH] small refactoring

---
 .github/workflows/release.yml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6eea8cfe8..a28be307f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -57,24 +57,19 @@ jobs:
           version: v3.7.0
       - name: Remove the build number from the charts' versions and re-package the helm charts
         run: |
-          SQ_CHART="sonarqube"
-          SQ_DCE_CHART="sonarqube-dce"
+          remove_build_number() {
+            local chart="$1"
+            if [ -d "$chart" ]; then
+              sed -i '/^version:/ {s/\(^version: [0-9]*\.[0-9]*\.[0-9]*\)\+.*/\1/;}' "$chart/Chart.yaml"
+              helm package "$chart"
+              rm -rf "$chart"
+            fi
+          }
 
           cd ${{ steps.local_repo.outputs.dir }}
 
-          # Remove the build number if SQ_CHART is present
-          if [ -d "$SQ_CHART" ]; then
-            sed -i '/^version:/ {s/\(^version: [0-9]*\.[0-9]*\.[0-9]*\)\+.*/\1/;}' $SQ_CHART/Chart.yaml
-            helm package $SQ_CHART
-            rm -rf $SQ_CHART
-          fi
-
-          # Remove the build number if SQ_DCE_CHART is present
-          if [ -d "$SQ_DCE_CHART" ]; then
-            sed -i '/^version:/ {s/\(^version: [0-9]*\.[0-9]*\.[0-9]*\)\+.*/\1/;}' $SQ_DCE_CHART/Chart.yaml
-            helm package $SQ_DCE_CHART
-            rm -rf $SQ_DCE_CHART
-          fi
+          remove_build_number "sonarqube"
+          remove_build_number "sonarqube-dce"
 
           cd ..
       - name: Check resulting files