mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '3.1.x' into 3.2.x
Closes gh-40687
This commit is contained in:
commit
d01a049dd1
6
.github/actions/build/action.yml
vendored
6
.github/actions/build/action.yml
vendored
@ -19,7 +19,7 @@ inputs:
|
|||||||
outputs:
|
outputs:
|
||||||
build-scan-url:
|
build-scan-url:
|
||||||
description: 'The URL, if any, of the build scan produced by the build'
|
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:
|
version:
|
||||||
description: 'The version that was built'
|
description: 'The version that was built'
|
||||||
value: ${{ steps.read-version.outputs.version }}
|
value: ${{ steps.read-version.outputs.version }}
|
||||||
@ -33,14 +33,14 @@ runs:
|
|||||||
java-toolchain: ${{ inputs.java-toolchain }}
|
java-toolchain: ${{ inputs.java-toolchain }}
|
||||||
- name: Build
|
- name: Build
|
||||||
id: build
|
id: build
|
||||||
if: ${{ !inputs.publish }}
|
if: ${{ inputs.publish == 'false' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
|
DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
- name: Build and Publish
|
- name: Build and Publish
|
||||||
id: build-and-publish
|
id: build-and-publish
|
||||||
if: ${{ inputs.publish }}
|
if: ${{ inputs.publish == 'true' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
|
DEVELOCITY_ACCESS_KEY: ${{ inputs.develocity-access-key }}
|
||||||
|
@ -18,7 +18,7 @@ runs:
|
|||||||
distribution: 'liberica'
|
distribution: 'liberica'
|
||||||
java-version: |
|
java-version: |
|
||||||
${{ inputs.java-version }}
|
${{ inputs.java-version }}
|
||||||
${{ inputs.java-toolchain && '17' || '' }}
|
${{ inputs.java-toolchain == 'true' && '17' || '' }}
|
||||||
- name: Set Up Gradle
|
- name: Set Up Gradle
|
||||||
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
|
uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3.3.2
|
||||||
with:
|
with:
|
||||||
@ -31,7 +31,7 @@ runs:
|
|||||||
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
|
echo 'systemProp.org.gradle.internal.launcher.welcomeMessageEnabled=false' >> $HOME/.gradle/gradle.properties
|
||||||
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
|
echo 'org.gradle.daemon=false' >> $HOME/.gradle/gradle.properties
|
||||||
- name: Configure Toolchain Properties
|
- name: Configure Toolchain Properties
|
||||||
if: ${{ inputs.java-toolchain }}
|
if: ${{ inputs.java-toolchain == 'true' }}
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo toolchainVersion=${{ inputs.java-version }} >> $HOME/.gradle/gradle.properties
|
echo toolchainVersion=${{ inputs.java-version }} >> $HOME/.gradle/gradle.properties
|
||||||
|
2
.github/actions/publish-to-sdkman/action.yml
vendored
2
.github/actions/publish-to-sdkman/action.yml
vendored
@ -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) }}"}' \
|
-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
|
https://vendors.sdkman.io/release
|
||||||
- shell: bash
|
- shell: bash
|
||||||
if: ${{ inputs.make-default }}
|
if: ${{ inputs.make-default == 'true' }}
|
||||||
run: >
|
run: >
|
||||||
curl -X POST \
|
curl -X POST \
|
||||||
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \
|
-H "Consumer-Key: ${{ inputs.sdkman-consumer-key }}" \
|
||||||
|
Loading…
Reference in New Issue
Block a user