From fd3bf5b352bbcc6d768bcab54be58feb5fa59b2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Fri, 5 Jul 2024 10:26:43 +0200
Subject: [PATCH] Harmonize CI configuration

This commit is a continuation of eacfd77d but for workflows specific
to the main branch.
---
 .../actions/print-jvm-thread-dumps/action.yml |  2 +-
 .github/workflows/build-pull-request.yml      | 22 +++++++------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/actions/print-jvm-thread-dumps/action.yml b/.github/actions/print-jvm-thread-dumps/action.yml
index bab22e54897a..9b0905b77725 100644
--- a/.github/actions/print-jvm-thread-dumps/action.yml
+++ b/.github/actions/print-jvm-thread-dumps/action.yml
@@ -7,7 +7,7 @@ runs:
       shell: bash
       run: |
         for jvm_pid in $(jps -q -J-XX:+PerfDisableSharedMem); do
-          jcmd $java_pid Thread.print
+          jcmd $jvm_pid Thread.print
         done
     - if: ${{ runner.os == 'Windows' }}
       shell: powershell
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
index fc5a448892c0..243d38207664 100644
--- a/.github/workflows/build-pull-request.yml
+++ b/.github/workflows/build-pull-request.yml
@@ -6,7 +6,7 @@ permissions:
 
 jobs:
   build:
-    name: Build pull request
+    name: Build Pull Request
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'spring-projects/spring-framework' }}
     steps:
@@ -15,27 +15,21 @@ jobs:
         with:
           java-version: '17'
           distribution: 'liberica'
-
-      - name: Check out code
+      - name: Check Out
         uses: actions/checkout@v4
-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2
-
-      - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5
-
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
+      - name: Set Up Gradle
+        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2
       - name: Build
         env:
           CI: 'true'
           GRADLE_ENTERPRISE_URL: 'https://ge.spring.io'
         run: ./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --no-parallel --continue build
-
-      - name: Print JVM thread dumps when cancelled
+      - name: Print JVM Thread Dumps When Cancelled
         uses: ./.github/actions/print-jvm-thread-dumps
         if: cancelled()
-
-      - name: Upload build reports
+      - name: Upload Build Reports
         uses: actions/upload-artifact@v4
         if: failure()
         with: