From 5cbb08cff40fd0577dc17e567d91f62fe008714d Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Tue, 14 Nov 2023 17:10:31 -0500
Subject: [PATCH] Use workflow outputs for build name & number

---
 ...ring-artifactory-gradle-release-staging.yml | 18 ++++++++++++++++--
 .../workflows/spring-artifactory-release.yml   | 12 ++++++------
 .github/workflows/stage-release.yml            |  8 ++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/spring-artifactory-gradle-release-staging.yml b/.github/workflows/spring-artifactory-gradle-release-staging.yml
index d22898a..ca3f144 100644
--- a/.github/workflows/spring-artifactory-gradle-release-staging.yml
+++ b/.github/workflows/spring-artifactory-gradle-release-staging.yml
@@ -13,6 +13,14 @@ on:
         default: 'dist'
         type: string
 
+    outputs:
+      buildName:
+        description: 'Artifactory Build Name'
+        value: ${{ jobs.staging-to-artifactory-with-gradle.outputs.buildName }}
+      buildNumber:
+        description: 'Artifactory Build Number'
+        value: ${{ jobs.staging-to-artifactory-with-gradle.outputs.buildNumber }}
+
 env:
   GRADLE_ENTERPRISE_CACHE_USERNAME: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USER }}
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
@@ -21,6 +29,10 @@ env:
 jobs:
   staging-to-artifactory-with-gradle:
     runs-on: ubuntu-latest
+    outputs:
+      buildName: ${{ steps.configure-jfrog.outputs.buildName }}
+      buildNumber: ${{ steps.configure-jfrog.outputs.buildNumber }}
+
     steps:
 
       - uses: actions/checkout@v4
@@ -48,12 +60,14 @@ jobs:
           JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 
       - name: Configure JFrog Cli
+        id: configure-jfrog
         run: |
           jf gradlec \
             --use-wrapper \
             --repo-deploy libs-staging-local
-          echo JFROG_CLI_BUILD_NAME=${{ github.event.repository.name }}-${{ inputs.releaseVersion }} >> $GITHUB_ENV
-          echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
+          
+          echo buildName=${{ github.event.repository.name }}-${{ inputs.releaseVersion }} >> $GITHUB_OUTPUT
+          echo buildNumber=$GITHUB_RUN_NUMBER >> $GITHUB_OUTPUT
 
       - name: Set Release Version
         run: sed -i "s/version=.*/version=${{ inputs.releaseVersion }}/" gradle.properties
diff --git a/.github/workflows/spring-artifactory-release.yml b/.github/workflows/spring-artifactory-release.yml
index 22db3b1..acdd11a 100644
--- a/.github/workflows/spring-artifactory-release.yml
+++ b/.github/workflows/spring-artifactory-release.yml
@@ -30,20 +30,20 @@ jobs:
 
   promote-milestone:
     if: ${{ contains(inputs.releaseVersion, '-M') || contains(inputs.releaseVersion, '-RC') }}
-    needs: verify-staged
+    needs: [staging, verify-staged]
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-promote-milestone.yml@main
     with:
-      buildName: ${{ env.JFROG_CLI_BUILD_NAME }}
-      buildNumber: ${{ env.JFROG_CLI_BUILD_NUMBER }}
+      buildName: ${{ needs.staging.outputs.buildName }}
+      buildNumber: ${{ needs.staging.outputs.buildNumber }}
     secrets: inherit
 
   promote-ga:
     if: ${{ ! contains(inputs.releaseVersion, '-') }}
-    needs: verify-staged
+    needs: [staging, verify-staged]
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-promote-central.yml@main
     with:
-      buildName: ${{ env.JFROG_CLI_BUILD_NAME }}
-      buildNumber: ${{ env.JFROG_CLI_BUILD_NUMBER }}
+      buildName: ${{ needs.staging.outputs.buildName }}
+      buildNumber: ${{ needs.staging.outputs.buildNumber }}
     secrets: inherit
 
   finalize:
diff --git a/.github/workflows/stage-release.yml b/.github/workflows/stage-release.yml
index 13ac4f1..a1e893a 100644
--- a/.github/workflows/stage-release.yml
+++ b/.github/workflows/stage-release.yml
@@ -8,6 +8,14 @@ on:
         required: true
         type: string
 
+    outputs:
+      buildName:
+        description: 'Artifactory Build Name'
+        value: ${{ jobs.staging-with-gradle.outputs.buildName }}
+      buildNumber:
+        description: 'Artifactory Build Number'
+        value: ${{ jobs.staging-with-gradle.outputs.buildNumber }}
+
 jobs:
   staging-with-gradle:
     uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-gradle-release-staging.yml@main