Skip to content

Commit 9e25e1d

Browse files
authored
Merge pull request #3176 from Multiverse/ben/update-gradle-action
Update gradle gha deps to v4
2 parents f966266 + e3409be commit 9e25e1d

File tree

3 files changed

+22
-29
lines changed

3 files changed

+22
-29
lines changed

.github/workflows/dispatch.javadoc.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,21 @@ jobs:
1414
javadocs:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
ref: ${{ inputs.target_tag }}
2020

21-
- uses: actions/setup-java@v3
21+
- uses: actions/setup-java@v4
2222
with:
2323
java-version: '11'
2424
distribution: 'adopt'
2525
cache: gradle
26-
26+
27+
- name: Setup Gradle
28+
uses: gradle/actions/setup-gradle@v4
29+
2730
- name: build javadoc
28-
uses: gradle/gradle-build-action@v2
29-
with:
30-
arguments: javadoc
31+
run: ./gradlew javadoc
3132
env:
3233
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3334
GITHUB_VERSION: ${{ inputs.target_tag }}

.github/workflows/generic.github_release.yml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,23 +43,21 @@ jobs:
4343
echo "version_bump: ${{ inputs.version_bump }}"
4444
echo "promote_from: ${{ inputs.promote_from }}"
4545
46-
- uses: actions/checkout@v3
46+
- uses: actions/checkout@v4
4747
with:
4848
ref: ${{ inputs.promote_from }}
4949

50-
- uses: actions/setup-java@v3
50+
- uses: actions/setup-java@v4
5151
with:
5252
java-version: '11'
5353
distribution: 'adopt'
5454
cache: gradle
5555

56-
- name: Validate Gradle wrapper
57-
uses: gradle/wrapper-validation-action@v1
56+
- name: Setup Gradle
57+
uses: gradle/actions/setup-gradle@v4
5858

5959
- name: Build and test
60-
uses: gradle/gradle-build-action@v2
61-
with:
62-
arguments: clean build -x assemble -x shadowJar
60+
run: ./gradlew clean build -x assemble -x shadowJar
6361
env:
6462
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6563

@@ -74,12 +72,10 @@ jobs:
7472

7573
- name: Publish package
7674
if: steps.release.outputs.release_created == 'true'
77-
uses: gradle/gradle-build-action@v2
78-
with:
79-
arguments: >
80-
publish -x test
81-
-PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
82-
-PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
75+
run: >
76+
./gradlew publish -x test
77+
-PmultiverseUsername=${{ secrets.REPOSILITE_REPO_USERNAME }}
78+
-PmultiversePassword=${{ secrets.REPOSILITE_REPO_PASSWORD }}
8379
env:
8480
GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
8581
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -96,9 +92,7 @@ jobs:
9692
- name: Generate javadoc
9793
id: javadoc
9894
if: steps.release.outputs.release_created == 'true' && steps.release.outputs.release_type == 'release'
99-
uses: gradle/gradle-build-action@v2
100-
with:
101-
arguments: javadoc
95+
run: ./gradlew javadoc
10296
env:
10397
GITHUB_VERSION: ${{ steps.release.outputs.publish_version }}
10498
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/generic.test.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,19 @@ jobs:
1414
permissions:
1515
contents: read
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818

19-
- uses: actions/setup-java@v3
19+
- uses: actions/setup-java@v4
2020
with:
2121
java-version: '11'
2222
distribution: 'adopt'
2323
cache: gradle
2424

25-
- name: Validate Gradle wrapper
26-
uses: gradle/wrapper-validation-action@v1
25+
- name: Setup Gradle
26+
uses: gradle/actions/setup-gradle@v4
2727

2828
- name: Run unit tests
29-
uses: gradle/gradle-build-action@v2
30-
with:
31-
arguments: build
29+
run: ./gradlew build
3230
env:
3331
GITHUB_VERSION: pr${{ github.event.pull_request.number }}
3432
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)