Harmonize GitHub Actions structure

This commit harmonizes the order of elements, in particular the settings
of the deploy step. It also adds the ability to build against a
different distribution than liberica.

Closes gh-41457
This commit is contained in:
Stéphane Nicoll
2024-07-12 09:11:41 +02:00
parent 8617c981cf
commit fc5fc7f5c3
4 changed files with 16 additions and 10 deletions

View File

@@ -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

View File

@@ -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'
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
repository: 'libs-staging-local'
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
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 }}
outputs:
version: ${{ steps.build-and-publish.outputs.version }}
verify:

View File

@@ -8,8 +8,8 @@ permissions:
jobs:
trigger-docs-build:
name: Trigger Docs Build
if: github.repository_owner == 'spring-projects'
runs-on: ubuntu-latest
if: github.repository_owner == 'spring-projects'
steps:
- name: Check Out
uses: actions/checkout@v4