From 126e07ac95332398d60d12455dec8afc933d4f00 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Thu, 19 Oct 2023 16:42:50 -0400
Subject: [PATCH] Some GH action refinements

---
 .github/workflows/CI.yml                | 13 +++----------
 .github/workflows/pr-build-workflow.yml | 15 ++++++---------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index a088f2b..08feb0d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,7 +15,7 @@ jobs:
   build_snapshot:
     runs-on: ubuntu-latest
     if: github.repository_owner == 'spring-projects'
-    name: CI Build ${{ github.ref_name }} SNAPSHOT
+    name: CI Build $GITHUB_REF_NAME SNAPSHOT
     steps:
 
       - uses: actions/checkout@v3
@@ -42,18 +42,11 @@ jobs:
             --server-id-deploy repo.spring.io \
             --repo-resolve snapshot \
             --repo-deploy snapshot
-          echo JFROG_CLI_BUILD_NAME=spring-integration-aws-${{ github.ref_name }} >> $GITHUB_ENV
+          echo JFROG_CLI_BUILD_NAME=${GITHUB_REPOSITORY#*/}-$GITHUB_REF_NAME >> $GITHUB_ENV
           echo JFROG_CLI_BUILD_NUMBER=$GITHUB_RUN_NUMBER >> $GITHUB_ENV
 
       - name: Build and Publish
         run: |
           jf gradle build dist artifactoryPublish -Duser.name=spring-builds+github
-          jf build-publish
+          jf rt build-publish
 
-      - name: Capture Test Results
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-results
-          path: '**/build/reports/tests/**/*.*'
-          retention-days: 3
diff --git a/.github/workflows/pr-build-workflow.yml b/.github/workflows/pr-build-workflow.yml
index 4b28aa4..4c91047 100644
--- a/.github/workflows/pr-build-workflow.yml
+++ b/.github/workflows/pr-build-workflow.yml
@@ -16,18 +16,15 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          distribution: 'temurin'
+          distribution: adopt
           java-version: 17
+          cache: gradle
 
       - name: Run Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: burrunan/gradle-cache-action@v1
         with:
+          debug: false
+          concurrent: true
+          gradle-build-scan-report: false
           arguments: check
 
-      - name: Capture Test Results
-        if: failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-results
-          path: '*/build/reports/tests/**/*.*'
-          retention-days: 3