Skip to content

Commit f4b55a6

Browse files
committed
Harmonize GitHub Actions settings
Closes gh-41463
1 parent f702230 commit f4b55a6

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.github/actions/build/action.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ inputs:
55
required: false
66
default: '17'
77
description: 'The Java version to compile and test with'
8+
java-distribution:
9+
required: false
10+
default: 'liberica'
11+
description: 'The Java distribution to use for the build'
812
java-toolchain:
913
required: false
10-
default: false
14+
default: 'false'
1115
description: 'Whether a Java toolchain should be used'
1216
publish:
1317
required: false
14-
default: false
18+
default: 'false'
1519
description: 'Whether to publish artifacts ready for deployment to Artifactory'
1620
develocity-access-key:
1721
required: false
@@ -31,6 +35,7 @@ runs:
3135
with:
3236
develocity-access-key: ${{ inputs.develocity-access-key }}
3337
java-version: ${{ inputs.java-version }}
38+
java-distribution: ${{ inputs.java-distribution }}
3439
java-toolchain: ${{ inputs.java-toolchain }}
3540
- name: Build
3641
id: build

.github/workflows/build-and-deploy-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uri: 'https://repo.spring.io'
2626
username: ${{ secrets.ARTIFACTORY_USERNAME }}
2727
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
28-
build-name: ${{ format('spring-boot-{0}', github.ref_name)}}
28+
build-name: 'spring-boot-3.2.x'
2929
repository: 'libs-snapshot-local'
3030
folder: 'deployment-repository'
3131
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22
on:
33
push:
44
branches:
5-
- 3.2.x
5+
- '3.2.x'
66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
88
jobs:
@@ -43,6 +43,7 @@ jobs:
4343
uses: ./.github/actions/build
4444
with:
4545
java-version: ${{ matrix.java.version }}
46+
java-distribution: ${{ matrix.java.distribution || 'liberica' }}
4647
java-toolchain: ${{ matrix.java.toolchain }}
4748
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_SECRET_ACCESS_KEY }}
4849
- name: Send Notification

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
88
jobs:
99
build-and-stage-release:
10-
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1110
name: Build and Stage Release
1211
runs-on: ubuntu-latest
12+
if: ${{ github.repository == 'spring-projects/spring-boot' }}
1313
steps:
1414
- name: Check Out Code
1515
uses: actions/checkout@v4
@@ -22,14 +22,14 @@ jobs:
2222
- name: Stage Release
2323
uses: spring-io/artifactory-deploy-action@26bbe925a75f4f863e1e529e85be2d0093cac116 # v0.0.1
2424
with:
25-
build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
26-
folder: 'deployment-repository'
25+
uri: 'https://repo.spring.io'
26+
username: ${{ secrets.ARTIFACTORY_USERNAME }}
2727
password: ${{ secrets.ARTIFACTORY_PASSWORD }}
28+
build-name: ${{ format('spring-boot-{0}', steps.build-and-publish.outputs.version)}}
2829
repository: 'libs-staging-local'
30+
folder: 'deployment-repository'
2931
signing-key: ${{ secrets.GPG_PRIVATE_KEY }}
3032
signing-passphrase: ${{ secrets.GPG_PASSPHRASE }}
31-
uri: 'https://repo.spring.io'
32-
username: ${{ secrets.ARTIFACTORY_USERNAME }}
3333
artifact-properties: |
3434
/**/spring-boot-docs-*.zip::zip.type=docs,zip.deployed=false
3535
outputs:

.github/workflows/run-system-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Run System Tests
22
on:
33
push:
44
branches:
5-
- 3.2.x
5+
- '3.2.x'
66
concurrency:
77
group: ${{ github.workflow }}-${{ github.ref }}
88
jobs:

0 commit comments

Comments
 (0)