From 5b2f8b90d5275351c0a72136e5298420f2764f37 Mon Sep 17 00:00:00 2001
From: Al Berez <al.berez@broadcom.com>
Date: Thu, 20 Jun 2024 16:54:35 -0700
Subject: [PATCH] Fix bosh upload blobs

Make sure to upload the blobs before committing, so that the updated object ID gets committed.
---
 .github/workflows/create-bosh-release.yml   | 5 -----
 ci/scripts/create-bosh-release-candidate.sh | 2 ++
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/create-bosh-release.yml b/.github/workflows/create-bosh-release.yml
index 31c6942..075f649 100644
--- a/.github/workflows/create-bosh-release.yml
+++ b/.github/workflows/create-bosh-release.yml
@@ -74,11 +74,6 @@ jobs:
         name: bosh-release-candidate
         path: ./cf-cli-dev-release.tgz
 
-    - name: Upload bosh blobs to blobstore
-      if:   ${{ vars.PRODUCTION == 'true' }}
-      run: |
-        bosh upload-blobs
-
     - name: Push changes
       if:   ${{ vars.PRODUCTION == 'true' }}
       uses: ad-m/github-push-action@9870d48124da805820c70ebc6ba563c715551019
diff --git a/ci/scripts/create-bosh-release-candidate.sh b/ci/scripts/create-bosh-release-candidate.sh
index f59aff9..816f405 100755
--- a/ci/scripts/create-bosh-release-candidate.sh
+++ b/ci/scripts/create-bosh-release-candidate.sh
@@ -30,6 +30,7 @@ add_and_commit_blob() {
 
   echo "::group::Adding blob for v${_major_version} - ${_downloaded_tarball_basename}"
   bosh add-blob "${_downloaded_tarball}" "${_downloaded_tarball_basename}"
+  bosh upload-blobs
   diff_and_commit_with_message "Setting CF CLI v${_major_version} to ${_full_version}"
   echo "::endgroup::"
 }
@@ -60,6 +61,7 @@ update_and_commit_blob() {
 
   echo "::group::Adding blob for v${_major_version} - ${_downloaded_tarball_basename}"
   bosh add-blob "${_downloaded_tarball}" "${_downloaded_tarball_basename}"
+  bosh upload-blobs
   diff_and_commit_with_message "Updating CF CLI v${_major_version} from ${_published_version} to ${_new_version}"
   echo "::endgroup::"
 }