From 5f72a6ec88623edffc06dcf9054e307595347bf0 Mon Sep 17 00:00:00 2001
From: Brian Upton <brian.upton@broadcom.com>
Date: Fri, 3 May 2024 16:38:19 -0500
Subject: [PATCH] Update auto-release pattern

Previously, if the patch version of the CLI was bumped due to the
`check-for-updated-binary-version` task returning successfully, then the
`check-for-patched-cves` task afterward would fail because it would try
to look up the new version as a git tag. If that didn't cause a failure
and it also returned successfully, the version could have been bumped
twice.

Now, the golang-release task scripts create a
release-notes/needs-release file when the condition for the script is
met. This allows us to chain the scripts together, build up release
notes from each script, then bump a single time if any of the scripts
were successful.
---
 ci/pipeline.yml | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index a83dcf7c2..9844c8643 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -163,14 +163,6 @@ jobs:
         params:
           PREVIOUS_BINARY_PATTERN: bosh-cli-*-linux-amd64
           CURRENT_BINARY_PATTERN: bosh-cli-*-linux-amd64
-        on_success:
-          do:
-          - put: release-notes
-            params:
-              file: release-notes/release-notes.md
-          - put: version-semver
-            params:
-              bump: patch
     - try:
         task: check-for-patched-cves
         file: golang-release/ci/tasks/shared/check-for-patched-cves.yml
@@ -180,20 +172,42 @@ jobs:
         params:
           SEVERITY: CRITICAL,HIGH
           SOURCE_PATH: # root path
+    - task: ensure-cve-checker-succeeded
+      file: golang-release/ci/tasks/shared/ensure-cve-checker-succeeded.yml
+      image: ubuntu-image
+      params:
+        description: |
+          Since the previous step is wrapped in a "try", this task checks that the previous step fully executed.
+    - try:
+        task: check-needs-release
+        config:
+          platform: linux
+          image_resource:
+            type: docker-image
+            source: {repository: alpine}
+          inputs:
+          - name: release-notes
+          run:
+            path: /bin/sh
+            args:
+            - -c
+            - |
+              if [ -f release-notes/needs-release ]; then
+                echo "## Release Notes"
+                echo "${release-notes/release-notes.md}"
+                exit 0
+              else
+                echo "No release needed"
+                exit 1
+              fi
         on_success:
           do:
           - put: release-notes
             params:
-              file: patched_cves/release-notes.md
+              file: release-notes/release-notes.md
           - put: version-semver
             params:
               bump: patch
-    - task: ensure-cve-checker-succeeded
-      file: golang-release/ci/tasks/shared/ensure-cve-checker-succeeded.yml
-      image: ubuntu-image
-      params:
-        description: |
-          Since the previous step is wrapped in a "try", this task checks that the previous step fully executed.
 
   - name: build
     public: true