Skip to content

Commit fd8cb32

Browse files
committed
Update workflows
1 parent 18ec990 commit fd8cb32

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

.github/workflows/build.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@ name: Build
44
on: # yamllint disable-line rule:truthy
55
push:
66
branches:
7-
- master
7+
- main
88
pull_request:
99
branches:
10-
- master
10+
- main
1111

1212
jobs:
1313
build:
1414
name: 'Build'
1515
strategy:
1616
matrix:
1717
os: ['ubuntu-latest']
18-
java-version: ['8']
19-
gradle-version: ['7.2']
18+
java-version: ['11']
19+
gradle-version: ['latest']
20+
gradle-command: ['gradle']
21+
include:
22+
- gradle-version: 'wrapper'
23+
gradle-command: './gradlew'
2024
runs-on: ${{ matrix.os }}
2125
steps:
2226
- name: 'Checkout'
@@ -42,6 +46,6 @@ jobs:
4246
build-scan-terms-of-use-agree: "yes"
4347
- name: 'Build'
4448
run: |
45-
gradle build
49+
${{matrix.gradle-command}} build
4650
env:
4751
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dependencies.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ jobs:
1414
name: 'Submit Dependencies'
1515
strategy:
1616
matrix:
17-
os: ['ubuntu-latest'] # Just one
18-
java-version: ['11'] # Just one
19-
gradle-version: ['7.2'] # Just one
17+
include:
18+
- os: 'ubuntu-latest'
19+
java-version: '11'
20+
gradle-version: 'wrapper'
2021
runs-on: ${{ matrix.os }}
2122
steps:
2223
- name: 'Checkout'

.github/workflows/publish.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ jobs:
1414
packages: write
1515
strategy:
1616
matrix:
17-
os: ['ubuntu-latest'] # Just one
18-
java-version: ['8'] # Just one
19-
gradle-version: ['7.2'] # Just one
17+
include:
18+
- os: 'ubuntu-latest'
19+
java-version: '11'
20+
gradle-version: 'wrapper'
21+
gradle-command: './gradlew'
2022
runs-on: ${{ matrix.os }}
2123
steps:
2224
- name: 'Checkout'
@@ -35,7 +37,7 @@ jobs:
3537
build-scan-publish: false # Might contain private keys or sensitive information
3638
- name: 'Publish to Maven Central'
3739
run: |
38-
gradle assemble publish closeAndReleaseSonatypeStagingRepository
40+
${{matrix.gradle-command}} assemble publish closeAndReleaseSonatypeStagingRepository
3941
env:
4042
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4143
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
@@ -44,7 +46,7 @@ jobs:
4446
SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
4547
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
4648
# Obtain the derived version number in the env.VERSION variable.
47-
- run: echo "VERSION=$(gradle -q :printVersion)" >> $GITHUB_ENV
49+
- run: echo "VERSION=$(${{matrix.gradle-command}} -q :printVersion)" >> $GITHUB_ENV
4850
- name: 'Release on GitHub'
4951
uses: softprops/action-gh-release@v2
5052
with:

0 commit comments

Comments
 (0)