From d4c5d8ccc084fa4f9927c13a7dd368981634da6d Mon Sep 17 00:00:00 2001
From: James Rawlings <rawlingsj80@gmail.com>
Date: Wed, 30 Jun 2021 15:45:46 +0100
Subject: [PATCH] chore: bring gha release pipeline into line with latest
 iamges

---
 .github/workflows/jenkins-x-pr.yaml      |  2 +-
 .github/workflows/jenkins-x-release.yaml | 46 ++++++++++++++----------
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/jenkins-x-pr.yaml b/.github/workflows/jenkins-x-pr.yaml
index 7169825b..18a80b20 100644
--- a/.github/workflows/jenkins-x-pr.yaml
+++ b/.github/workflows/jenkins-x-pr.yaml
@@ -7,7 +7,7 @@ jobs:
     - env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       name: jx-variables
-      uses: docker://gcr.io/jenkinsxio/jx-boot:3.1.170
+      uses: docker://ghcr.io/jenkins-x/jx-boot:3.2.157
       with:
         args: gitops variables
         entrypoint: jx
diff --git a/.github/workflows/jenkins-x-release.yaml b/.github/workflows/jenkins-x-release.yaml
index aa725b10..ac33e5b6 100644
--- a/.github/workflows/jenkins-x-release.yaml
+++ b/.github/workflows/jenkins-x-release.yaml
@@ -3,23 +3,24 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
+    - uses: actions/checkout@v2
       with:
-        fetch-depth: "0"
+        fetch-depth: 0
         token: ${{ secrets.GIT_BOT_TOKEN }}
-    - uses: fusion-engineering/setup-git-credentials@v2
+    - run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
+
+    - uses: fregante/setup-git-user@v1
+
+    - name: prep
+      id: prep
+      uses: jenkins-x-plugins/jx-release-version@v2.4.13
       with:
-        credentials: ${{ format('https://x-access-token:{0}@github.com/', secrets.GIT_BOT_TOKEN) }}
-    - id: prep
-      name: Set the release version
-      uses: docker://gcr.io/jenkinsxio/jx-release-version:1.0.46
-      with:
-        args: -c "echo ::set-output name=version::$(jx-release-version)"
-        entrypoint: bash
+        tag: true
+        github-token: ${{ secrets.GIT_BOT_TOKEN }}
+
     - env:
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
-        VERSION: ${{ steps.prep.outputs.version}}
+        VERSION: ${{ steps.prep.outputs.version }}
       name: release-binary
       uses: docker://golang:1.15
       with:
@@ -27,7 +28,7 @@ jobs:
         entrypoint: bash
     - env:
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
-        VERSION: ${{ steps.prep.outputs.version}}
+        VERSION: ${{ steps.prep.outputs.version }}
       name: chart-docs
       uses: docker://jnorwood/helm-docs:v1.4.0
       with:
@@ -37,15 +38,15 @@ jobs:
     - env:
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
         REPO_NAME: ${{ github.event.repository.name }}
-        VERSION: ${{ steps.prep.outputs.version}}
+        VERSION: ${{ steps.prep.outputs.version }}
       name: changelog
-      uses: docker://gcr.io/jenkinsxio/jx-changelog:0.0.30
+      uses: docker://ghcr.io/jenkins-x/jx-changelog:0.0.43
       with:
         entrypoint: .github/workflows/jenkins-x/changelog.sh
     - env:
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
         REPOSITORY: ${{ github.repository }}
-        VERSION: ${{ steps.prep.outputs.version}}
+        VERSION: ${{ steps.prep.outputs.version }}
       name: upload-binaries
       uses: docker://goreleaser/goreleaser:v0.155.0
       with:
@@ -72,13 +73,21 @@ jobs:
         tags: |
           ghcr.io/${{ github.repository }}:latest
           ghcr.io/${{ github.repository }}:${{ steps.prep.outputs.version }}
+    - env:
+        GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
+        JX_REPOSITORY_USERNAME: jenkins-x-bot-test
+        VERSION: ${{ steps.prep.outputs.version }}
+      name: release-chart
+      uses: docker://ghcr.io/jenkins-x/jx-boot:3.1.284
+      with:
+        entrypoint: .github/workflows/jenkins-x/release-chart.sh
     - env:
         GIT_USERNAME: jenkins-x-bot-test
         GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }}
-        VERSION: ${{ steps.prep.outputs.version}}
+        VERSION: ${{ steps.prep.outputs.version }}
         XDG_CONFIG_HOME: /github/home/.config
       name: promote-release
-      uses: docker://gcr.io/jenkinsxio/jx-updatebot:0.0.49
+      uses: docker://ghcr.io/jenkins-x/jx-updatebot:0.0.84
       with:
         entrypoint: jx-updatebot
         args: pr --git-credentials
@@ -86,4 +95,3 @@ jobs:
   push:
     branches:
     - main
-    - master