From 6292c9eda0d5a33cf22348f2424ece9d34738188 Mon Sep 17 00:00:00 2001
From: a5r0n <32464596+a5r0n@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:07:25 +0300
Subject: [PATCH 1/6] ci: Add workflow to automate chart version bump & release

Fixes #49

Add a new workflow to automate chart version bump and release.

* **New Workflow**: Add `.github/workflows/ci-version-bump.yml` to automate version bumps.
  - Bump patch version on n8n major/minor and patch for n8n patch versions.
  - Bump minor version for template changes.
* **Renovate Configuration**: Update `renovate.json` to include chart version bumping.
  - Add package rules for Docker and template changes.
  - Set bump version to patch for Docker and minor for template changes.

---

For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/a5r0n/n8n-chart/issues/49?shareId=XXXX-XXXX-XXXX-XXXX).
---
 .github/workflows/ci-version-bump.yml | 56 +++++++++++++++++++++++++++
 renovate.json                         | 14 ++++++-
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/ci-version-bump.yml

diff --git a/.github/workflows/ci-version-bump.yml b/.github/workflows/ci-version-bump.yml
new file mode 100644
index 0000000..2a35452
--- /dev/null
+++ b/.github/workflows/ci-version-bump.yml
@@ -0,0 +1,56 @@
+name: CI Version Bump
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  version-bump:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '14'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Bump version
+        id: bump-version
+        run: |
+          CURRENT_VERSION=$(grep -oP '^version: \K.*' n8n/Chart.yaml)
+          N8N_VERSION=$(grep -oP '^appVersion: "\K.*(?=")' n8n/Chart.yaml)
+          TEMPLATE_CHANGED=$(git diff --name-only HEAD~1 HEAD | grep -E 'n8n/templates/.*\.yaml' || true)
+          if [[ $TEMPLATE_CHANGED ]]; then
+            NEW_VERSION=$(npm version minor --no-git-tag-version)
+          else
+            NEW_VERSION=$(npm version patch --no-git-tag-version)
+          fi
+          echo "New version: $NEW_VERSION"
+          sed -i "s/^version: .*/version: $NEW_VERSION/" n8n/Chart.yaml
+
+      - name: Commit changes
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add n8n/Chart.yaml
+          git commit -m "ci: bump chart version to $NEW_VERSION"
+          git push
+
+      - name: Create release
+        uses: actions/create-release@v1
+        with:
+          tag_name: ${{ steps.bump-version.outputs.NEW_VERSION }}
+          release_name: Release ${{ steps.bump-version.outputs.NEW_VERSION }}
+          body: |
+            Automated release for version ${{ steps.bump-version.outputs.NEW_VERSION }}
+          draft: false
+          prerelease: false
diff --git a/renovate.json b/renovate.json
index e60459a..c4164ed 100644
--- a/renovate.json
+++ b/renovate.json
@@ -11,5 +11,17 @@
       ]
     }
   ],
-  "bumpVersion": "patch"
+  "bumpVersion": "patch",
+  "packageRules": [
+    {
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["ghcr.io/n8n-io/n8n"],
+      "versioning": "semver",
+      "bumpVersion": "patch"
+    },
+    {
+      "matchPaths": ["n8n/templates/**/*.yaml"],
+      "bumpVersion": "minor"
+    }
+  ]
 }

From 6ccee1df376122dd0df92d5e533c3070810ee7d6 Mon Sep 17 00:00:00 2001
From: a5r0n <32464596+a5r0n@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:30:27 +0300
Subject: [PATCH 2/6] Add new CI version bump workflow and update README

* **.github/workflows/ci-version-bump.yml**
  - Replace Node.js setup with Python setup
  - Install semver using pip
  - Use Python and semver for version bumping instead of npm

* **README.md**
  - Add instructions for the new CI version bump workflow
---
 .github/workflows/ci-version-bump.yml | 15 ++++++++-------
 README.md                             | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-version-bump.yml b/.github/workflows/ci-version-bump.yml
index 2a35452..b9d8659 100644
--- a/.github/workflows/ci-version-bump.yml
+++ b/.github/workflows/ci-version-bump.yml
@@ -15,13 +15,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
+      - name: Set up Python
+        uses: actions/setup-python@v2
         with:
-          node-version: '14'
+          python-version: '3.x'
 
-      - name: Install dependencies
-        run: npm install
+      - name: Install semver
+        run: |
+          pip install semver
 
       - name: Bump version
         id: bump-version
@@ -30,9 +31,9 @@ jobs:
           N8N_VERSION=$(grep -oP '^appVersion: "\K.*(?=")' n8n/Chart.yaml)
           TEMPLATE_CHANGED=$(git diff --name-only HEAD~1 HEAD | grep -E 'n8n/templates/.*\.yaml' || true)
           if [[ $TEMPLATE_CHANGED ]]; then
-            NEW_VERSION=$(npm version minor --no-git-tag-version)
+            NEW_VERSION=$(python -c "import semver; print(semver.VersionInfo.parse('$CURRENT_VERSION').bump_minor())")
           else
-            NEW_VERSION=$(npm version patch --no-git-tag-version)
+            NEW_VERSION=$(python -c "import semver; print(semver.VersionInfo.parse('$CURRENT_VERSION').bump_patch())")
           fi
           echo "New version: $NEW_VERSION"
           sed -i "s/^version: .*/version: $NEW_VERSION/" n8n/Chart.yaml
diff --git a/README.md b/README.md
index 0a4fe8a..77b9150 100644
--- a/README.md
+++ b/README.md
@@ -45,3 +45,21 @@ ingress:
 ```
 
 see [values.yaml](./n8n/values.yaml)
+
+## CI Version Bump Workflow
+
+A new workflow has been added to automate chart version bump and release. The workflow is defined in the `.github/workflows/ci-version-bump.yml` file and performs the following actions:
+
+* Bumps patch version on n8n major/minor and patch for n8n patch versions.
+* Bumps minor version for template changes.
+
+The workflow is triggered on push and pull request events to the `main` branch. It performs the following steps:
+
+1. Checks out the code.
+2. Sets up Node.js environment.
+3. Installs dependencies.
+4. Bumps the chart version based on changes.
+5. Commits the changes.
+6. Creates a release.
+
+The version bumping is done for the Helm chart version, not for a Node.js package.

From 098bec3277a33c15e13857684127702626fa907a Mon Sep 17 00:00:00 2001
From: a5r0n <32464596+a5r0n@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:39:19 +0300
Subject: [PATCH 3/6] Add new workflow for version bumping and update README

* **README.md**
  - Add instructions for the new workflow
  - Update steps to include Python environment setup and `python semver` installation

* **.github/workflows/ci-version-bump.yml**
  - Add condition to only push version changes on main branch runs
  - Add step to comment on the next version to publish after a PR merge

* **renovate.json**
  - Update to include chart version bumping
---
 .github/workflows/ci-version-bump.yml | 9 +++++++++
 README.md                             | 7 +++++--
 renovate.json                         | 4 ++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-version-bump.yml b/.github/workflows/ci-version-bump.yml
index b9d8659..03d0a8e 100644
--- a/.github/workflows/ci-version-bump.yml
+++ b/.github/workflows/ci-version-bump.yml
@@ -39,6 +39,7 @@ jobs:
           sed -i "s/^version: .*/version: $NEW_VERSION/" n8n/Chart.yaml
 
       - name: Commit changes
+        if: github.ref == 'refs/heads/main'
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
@@ -47,6 +48,7 @@ jobs:
           git push
 
       - name: Create release
+        if: github.ref == 'refs/heads/main'
         uses: actions/create-release@v1
         with:
           tag_name: ${{ steps.bump-version.outputs.NEW_VERSION }}
@@ -55,3 +57,10 @@ jobs:
             Automated release for version ${{ steps.bump-version.outputs.NEW_VERSION }}
           draft: false
           prerelease: false
+
+      - name: Comment on PR
+        if: github.event_name == 'pull_request'
+        run: |
+          PR_NUMBER=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
+          COMMENT_BODY="Next version to publish after this PR is merged: $NEW_VERSION"
+          gh pr comment $PR_NUMBER --body "$COMMENT_BODY"
diff --git a/README.md b/README.md
index 77b9150..8dfb82d 100644
--- a/README.md
+++ b/README.md
@@ -52,14 +52,17 @@ A new workflow has been added to automate chart version bump and release. The wo
 
 * Bumps patch version on n8n major/minor and patch for n8n patch versions.
 * Bumps minor version for template changes.
+* Only pushes version changes on main branch runs.
+* Comments on the next version to publish after a PR merge.
 
 The workflow is triggered on push and pull request events to the `main` branch. It performs the following steps:
 
 1. Checks out the code.
-2. Sets up Node.js environment.
-3. Installs dependencies.
+2. Sets up Python environment.
+3. Installs `python semver`.
 4. Bumps the chart version based on changes.
 5. Commits the changes.
 6. Creates a release.
+7. Comments on the next version to publish after a PR merge.
 
 The version bumping is done for the Helm chart version, not for a Node.js package.
diff --git a/renovate.json b/renovate.json
index c4164ed..814ed1a 100644
--- a/renovate.json
+++ b/renovate.json
@@ -22,6 +22,10 @@
     {
       "matchPaths": ["n8n/templates/**/*.yaml"],
       "bumpVersion": "minor"
+    },
+    {
+      "matchPaths": ["n8n/Chart.yaml"],
+      "bumpVersion": "patch"
     }
   ]
 }

From f301cab5cdab1991f2a1ca9f0e5e7298434486c9 Mon Sep 17 00:00:00 2001
From: a5r0n <32464596+a5r0n@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:43:41 +0300
Subject: [PATCH 4/6]

---
 .github/workflows/ci-version-bump.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci-version-bump.yml b/.github/workflows/ci-version-bump.yml
index 03d0a8e..9815867 100644
--- a/.github/workflows/ci-version-bump.yml
+++ b/.github/workflows/ci-version-bump.yml
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Set up Python
         uses: actions/setup-python@v2

From 1f2b48bb51653d67c9f8ced9e226b68f5b36c5d2 Mon Sep 17 00:00:00 2001
From: a5r0n <32464596+a5r0n@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:48:26 +0300
Subject: [PATCH 5/6]

---
 .github/workflows/ci-version-bump.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci-version-bump.yml b/.github/workflows/ci-version-bump.yml
index 9815867..6df5a0e 100644
--- a/.github/workflows/ci-version-bump.yml
+++ b/.github/workflows/ci-version-bump.yml
@@ -62,7 +62,8 @@ jobs:
 
       - name: Comment on PR
         if: github.event_name == 'pull_request'
-        run: |
-          PR_NUMBER=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")
-          COMMENT_BODY="Next version to publish after this PR is merged: $NEW_VERSION"
-          gh pr comment $PR_NUMBER --body "$COMMENT_BODY"
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          message: |
+            Next version to publish after this PR is merged: `${{ steps.bump-version.outputs.NEW_VERSION }}`
+          comment_tag: next_version
\ No newline at end of file

From 191ae1c59c5283a876f00cc1820ad16fa7d3f20c Mon Sep 17 00:00:00 2001
From: a5r0n <32464596+a5r0n@users.noreply.github.com>
Date: Thu, 17 Oct 2024 21:52:11 +0300
Subject: [PATCH 6/6] Add output for NEW_VERSION and update PR comment action

* Add `::set-output name=NEW_VERSION::$NEW_VERSION` to make NEW_VERSION available as output
* Add `comment_tag: next_version` to the PR comment action configuration
---
 .github/workflows/ci-version-bump.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-version-bump.yml b/.github/workflows/ci-version-bump.yml
index 6df5a0e..3eb7fa6 100644
--- a/.github/workflows/ci-version-bump.yml
+++ b/.github/workflows/ci-version-bump.yml
@@ -39,6 +39,7 @@ jobs:
           fi
           echo "New version: $NEW_VERSION"
           sed -i "s/^version: .*/version: $NEW_VERSION/" n8n/Chart.yaml
+          echo "::set-output name=NEW_VERSION::$NEW_VERSION"
 
       - name: Commit changes
         if: github.ref == 'refs/heads/main'
@@ -64,6 +65,6 @@ jobs:
         if: github.event_name == 'pull_request'
         uses: thollander/actions-comment-pull-request@v3
         with:
+          comment_tag: next_version
           message: |
-            Next version to publish after this PR is merged: `${{ steps.bump-version.outputs.NEW_VERSION }}`
-          comment_tag: next_version
\ No newline at end of file
+            Next version to publish after this PR is merged: `${{ steps.bump-version.outputs.NEW_VERSION }}`
\ No newline at end of file