From 57e56b13744b26c1e5bb3e46ee55f22ed4271db1 Mon Sep 17 00:00:00 2001
From: Nicholas openSUSE Software Engineer <nicholas.paolillo@suse.com>
Date: Wed, 5 Feb 2025 16:38:35 -0300
Subject: [PATCH] [dev-v2.10] Auto bump improvement icons && version (#5093)

---
 .github/workflows/auto-bump.yaml | 8 +++++---
 scripts/version                  | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-bump.yaml b/.github/workflows/auto-bump.yaml
index 9365205ce8..71cbce2d03 100644
--- a/.github/workflows/auto-bump.yaml
+++ b/.github/workflows/auto-bump.yaml
@@ -36,7 +36,9 @@ jobs:
       - name: make chart-bump
         run: |
           echo "make chart-bump package=${{ env.CHART }} branch=${{ env.BRANCH }}"
-          make chart-bump package="${{ env.CHART }}" branch="${{ env.BRANCH }}"
+          last_line=$(make chart-bump package="${{ env.CHART }}" branch="${{ env.BRANCH }}" | tail -n 1)
+          echo "new_version=$last_line" >> $GITHUB_ENV
+
 
       - name: Git status
         run: |
@@ -67,11 +69,11 @@ jobs:
       - name: Git Add, Commit, Push Changes
         run: |
           git add .
-          git commit -m "Auto bump chart version for ${{ env.CHART }}"
+          git commit -m "auto bump chart: ${{ env.CHART }} version: ${{ env.new_version }}"
           git push origin "auto-bump_${{ env.CHART }}"
 
       - name: Create Pull Request
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
         run: |
-          gh pr create --base ${{ env.BRANCH }} --head "auto-bump_${{ env.CHART }}" --title "[${{ env.BRANCH }}] auto bump: ${{ env.CHART }}" --body $'This PR auto-bumps the chart version for ${{ env.CHART }}.\n---\n## Review Checklist: \n- [ ] CRDs\n- [ ] templates folder if any\n- [ ] Version \n##### Checkpoints for Chart Bumps \n'\nrelease.yaml`: \n- [ ] Each chart version in release.yaml DOES NOT modify an already released chart. If so, stop and modify the versions so that it releases a net-new chart.\n- [ ] Each chart version in release.yaml IS exactly 1 more patch or minor version than the last released chart version. If not, stop and modify the versions so that it releases a net-new chart.\n\n`Chart.yaml and index.yaml`: \n- [ ] The `index.yaml` file has an entry for your new chart version. \n- [ ] The `index.yaml` entries for each chart matches the `Chart.yaml` for each chart. \n- [ ] Each chart has ALL required annotations \n- kube-version annotation \n- rancher-version annotation \n- permits-os annotation (indicates Windows and/or Linux) \n`
+          gh pr create --base ${{ env.BRANCH }} --head "auto-bump_${{ env.CHART }}" --title "[${{ env.BRANCH }}] auto bump: ${{ env.CHART }} - ${{ env.new_version }}" --body $'This PR auto-bumps the chart version for ${{ env.CHART }} - ${{ env.new_version }}.\n---\n## Review Checklist: \n- [ ] CRDs\n- [ ] templates folder if any\n- [ ] Version \n##### Checkpoints for Chart Bumps \n'\nrelease.yaml`: \n- [ ] Each chart version in release.yaml DOES NOT modify an already released chart. If so, stop and modify the versions so that it releases a net-new chart.\n- [ ] Each chart version in release.yaml IS exactly 1 more patch or minor version than the last released chart version. If not, stop and modify the versions so that it releases a net-new chart.\n\n`Chart.yaml and index.yaml`: \n- [ ] The `index.yaml` file has an entry for your new chart version. \n- [ ] The `index.yaml` entries for each chart matches the `Chart.yaml` for each chart. \n- [ ] Each chart has ALL required annotations \n- kube-version annotation \n- rancher-version annotation \n- permits-os annotation (indicates Windows and/or Linux) \n`
diff --git a/scripts/version b/scripts/version
index 93c684a56c..0973b995a2 100755
--- a/scripts/version
+++ b/scripts/version
@@ -2,4 +2,4 @@
 set -e
 
 CHARTS_BUILD_SCRIPTS_REPO=https://github.com/rancher/charts-build-scripts.git
-CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v1.3.8}"
+CHARTS_BUILD_SCRIPT_VERSION="${CHARTS_BUILD_SCRIPT_VERSION:-v1.4.1}"