From f4b55a6f2885d3516dc7027098359afdd7a770b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Fri, 12 Jul 2024 12:08:11 +0200
Subject: [PATCH] Harmonize GitHub Actions settings

Closes gh-41463
---
 .github/actions/build/action.yml                |  9 +++++++--
 .github/workflows/build-and-deploy-snapshot.yml |  2 +-
 .github/workflows/ci.yml                        |  3 ++-
 .github/workflows/release.yml                   | 10 +++++-----
 .github/workflows/run-system-tests.yml          |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index c01dc1c34c9..6328d227e43 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -5,13 +5,17 @@ inputs:
     required: false
     default: '17'
     description: 'The Java version to compile and test with'
+  java-distribution:
+    required: false
+    default: 'liberica'
+    description: 'The Java distribution to use for the build'
   java-toolchain:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether a Java toolchain should be used'
   publish:
     required: false
-    default: false
+    default: 'false'
     description: 'Whether to publish artifacts ready for deployment to Artifactory'
   develocity-access-key:
     required: false
@@ -31,6 +35,7 @@ runs:
       with:
         develocity-access-key: ${{ inputs.develocity-access-key }}
         java-version: ${{ inputs.java-version }}
+        java-distribution: ${{ inputs.java-distribution }}
         java-toolchain: ${{ inputs.java-toolchain }}
     - name: Build
       id: build
diff --git a/.github/workflows/build-and-deploy-snapshot.yml b/.github/workflows/build-and-deploy-snapshot.yml
index e09fa97a802..f2d5ebeb5a3 100644
--- a/.github/workflows/build-and-deploy-snapshot.yml
+++ b/.github/workflows/build-and-deploy-snapshot.yml
@@ -25,7 +25,7 @@ jobs:
           uri: 'https://repo.spring.io'
           username: ${{ secrets.ARTIFACTORY_USERNAME }}
           password: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          build-name: ${{ format('spring-boot-{0}', github.ref_name)}}
+          build-name: 'spring-boot-3.2.x'
           repository: 'libs-snapshot-local'
           folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e65aa5e129c..bb11ce3762b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 on:
   push:
     branches:
-      - 3.2.x
+      - '3.2.x'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
@@ -43,6 +43,7 @@ jobs:
         uses: ./.github/actions/build
         with:
           java-version: ${{ matrix.java.version }}
+          java-distribution: ${{ matrix.java.distribution || 'liberica' }}
           java-toolchain: ${{ matrix.java.toolchain }}
           develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
       - name: Send Notification
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7c80a04a25f..657ecec764f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,9 +7,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs:
   build-and-stage-release:
-    if: ${{ github.repository == 'spring-projects/spring-boot' }}
     name: Build and Stage Release
     runs-on: ubuntu-latest
+    if: ${{ github.repository == 'spring-projects/spring-boot' }}
     steps:
       - name: Check Out Code
         uses: actions/checkout@v4
@@ -22,14 +22,14 @@ jobs:
       - name: Stage Release
         uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
         with:
-          build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
-          folder: 'deployment-repository'
+          uri: 'https://repo.spring.io'
+          username: ${{ secrets.ARTIFACTORY_USERNAME }}
           password: ${{ secrets.ARTIFACTORY_PASSWORD }}
+          build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
           repository: 'libs-staging-local'
+          folder: 'deployment-repository'
           signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
           signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          uri: 'https://repo.spring.io'
-          username: ${{ secrets.ARTIFACTORY_USERNAME }}
           artifact-properties: |
             /**/spring-boot-docs-*.zip::zip.type=docs,zip.deployed=false
     outputs:
diff --git a/.github/workflows/run-system-tests.yml b/.github/workflows/run-system-tests.yml
index ba145395474..927437ee3fe 100644
--- a/.github/workflows/run-system-tests.yml
+++ b/.github/workflows/run-system-tests.yml
@@ -2,7 +2,7 @@ name: Run System Tests
 on:
   push:
     branches:
-      - 3.2.x
+      - '3.2.x'
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 jobs: