Merge branch '3.1.x' into 3.2.x

Closes gh-40687
This commit is contained in:
Andy Wilkinson 2024-05-10 08:46:31 +01:00
commit d01a049dd1
3 changed files with 6 additions and 6 deletions

View File

@ -19,7 +19,7 @@ inputs:
outputs:
build-scan-url:
description: 'The URL, if any, of the build scan produced by the build'
value: ${{ (inputs.publish && steps.build-and-publish.outputs.build-scan-url) || steps.build.outputs.build-scan-url }}
value: ${{ (inputs.publish == 'true' && steps.build-and-publish.outputs.build-scan-url) || steps.build.outputs.build-scan-url }}
version:
description: 'The version that was built'
value: ${{ steps.read-version.outputs.version }}
@ -33,14 +33,14 @@ runs:
java-toolchain: ${{ inputs.java-toolchain }}
- name: Build
id: build
if: ${{ !inputs.publish }}
if: ${{ inputs.publish == 'false' }}
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
run: ./gradlew build
- name: Build and Publish
id: build-and-publish
if: ${{ inputs.publish }}
if: ${{ inputs.publish == 'true' }}
shell: bash
env:
DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}

View File

@ -18,7 +18,7 @@ runs:
distribution: 'liberica'
java-version: |
${{ inputs.java-version }}
${{ inputs.java-toolchain && '17' || '' }}
${{ inputs.java-toolchain == 'true' && '17' || '' }}
- name: Set Up Gradle
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
with:
@ -31,7 +31,7 @@ runs:
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
- name: Configure Toolchain Properties
if: ${{ inputs.java-toolchain }}
if: ${{ inputs.java-toolchain == 'true' }}
shell: bash
run: |
echo toolchainVersion=${{ inputs.java-version }} >> $HOME/.gradle/gradle.properties

View File

@ -27,7 +27,7 @@ runs:
-d '{"candidate": "springboot", "version": "${{ inputs.spring-boot-version }}", "url": "${{ format('https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/{0}/spring-boot-cli-{0}-bin.zip', inputs.spring-boot-version) }}"}' \
https://vendors.sdkman.io/release
- shell: bash
if: ${{ inputs.make-default }}
if: ${{ inputs.make-default == 'true' }}
run: >
curl -X POST \
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \