From 51e6784f888131233adda61bc605e7624fa4b81f Mon Sep 17 00:00:00 2001
From: Matthew Mentlak <93769720+mentlak0@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:02:45 +0100
Subject: [PATCH] Amend/publish workflow (#56)

---
 .github/workflows/increment-chart-version.yml | 30 -------------------
 .github/workflows/publish.yml                 | 21 ++++++++++++-
 2 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/increment-chart-version.yml

diff --git a/.github/workflows/increment-chart-version.yml b/.github/workflows/increment-chart-version.yml
deleted file mode 100644
index 7d5fa05..0000000
--- a/.github/workflows/increment-chart-version.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Increment Chart Version
-
-on: [push, pull_request, pull_request_target]
-
-jobs:
-  build:
-    runs-on: ubuntu-20.04
-    permissions:
-      contents: write
-    
-    steps:
-      - name: check source code
-        uses: actions/checkout@v3
-          
-      - name: next release version
-        id: nextversion
-        uses: jenkins-x-plugins/jx-release-version@v2.6.11
-        with:
-          previous-version: from-file:charts/tekton-pipeline/Chart.yaml
-
-      - name: Update version in Chart.yaml
-        id: updatechart
-        uses: mikefarah/yq@v4.34.1
-        with:
-          cmd: yq eval '.version = "${{ steps.nextversion.outputs.version }}"' -i charts/tekton-pipeline/Chart.yaml
-
-      - name: Commit Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: 'chore: update Chart.yaml'
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 92992d6..c94d199 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,7 +9,26 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - name: check source code
+        uses: actions/checkout@v3
+
+      - name: next release version
+        id: nextversion
+        uses: jenkins-x-plugins/jx-release-version@v2.6.11
+        with:
+          previous-version: from-file:charts/tekton-pipeline/Chart.yaml
+
+      - name: Update version in Chart.yaml
+        id: updatechart
+        uses: mikefarah/yq@v4.34.1
+        with:
+          cmd: yq eval '.version = "${{ steps.nextversion.outputs.version }}"' -i charts/tekton-pipeline/Chart.yaml
+          
+      - name: Commit Changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'chore: update Chart.yaml'
+
       - uses: J12934/helm-gh-pages-action@master
         with:
           access-token: ${{ secrets.ACCESS_TOKEN }}