Skip to content

Commit a02d3e4

Browse files
rainboyanrainboyan
committed
Update github workflows
- Upgrade to setup-gradle@v4 - Upgrade to latest ubuntu
1 parent d23237b commit a02d3e4

File tree

5 files changed

+28
-30
lines changed

5 files changed

+28
-30
lines changed

‎.github/workflows/gradle.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,50 +12,51 @@ jobs:
1212
if: ${{ github.repository == 'graceframework/grace-framework' }}
1313
permissions:
1414
contents: read # to fetch code (actions/checkout)
15-
runs-on: ubuntu-22.04
15+
runs-on: ubuntu-latest
1616
strategy:
1717
matrix:
1818
java: ['17']
1919
env:
2020
WORKSPACE: ${{ github.workspace }}
2121
steps:
2222
- uses: actions/checkout@v4
23-
- name: Set up JDK
23+
- name: Setup JDK
2424
uses: actions/setup-java@v4
2525
with:
2626
distribution: 'adopt'
2727
java-version: ${{ matrix.java }}
28+
- name: Setup Gradle
29+
uses: gradle/actions/setup-gradle@v4
2830
- name: Run Build
2931
id: build
30-
uses: gradle/actions/setup-gradle@v3
31-
with:
32-
arguments: build -x codenarcMain -x codenarcTest -x checkstyleMain -x checkstyleTest
32+
run: ./gradlew build -x codenarcMain -x codenarcTest -x checkstyleMain -x checkstyleTest
3333
publish:
3434
if: github.event_name == 'push'
3535
needs: ["build"]
3636
permissions:
3737
contents: read # to fetch code (actions/checkout)
3838
checks: write
39-
runs-on: ubuntu-22.04
39+
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout repository
4242
env:
4343
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4444
uses: actions/checkout@v4
4545
with:
4646
token: ${{ secrets.GITHUB_TOKEN }}
47-
- name: Set up JDK 17
47+
- name: Setup JDK
4848
uses: actions/setup-java@v4
4949
with:
5050
distribution: 'adopt'
5151
java-version: 17
52+
- name: Setup Gradle
53+
uses: gradle/actions/setup-gradle@v4
5254
- name: Generate secring file
5355
env:
5456
SECRING_FILE: ${{ secrets.SECRING_FILE }}
5557
run: echo $SECRING_FILE | base64 -d > ${{ github.workspace }}/secring.gpg
5658
- name: Publish to Sonatype OSSRH
5759
id: publish
58-
uses: gradle/actions/setup-gradle@v3
5960
env:
6061
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
6162
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -64,5 +65,4 @@ jobs:
6465
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
6566
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
6667
SECRING_FILE: ${{ secrets.SECRING_FILE }}
67-
with:
68-
arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository
68+
run: ./gradlew -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository

‎.github/workflows/gradleplugin.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions: {}
88
jobs:
99
publish_plugins:
1010
if: ${{ github.repository == 'graceframework/grace-framework' }}
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
1414
java: ['17']
@@ -18,15 +18,15 @@ jobs:
1818
with:
1919
token: ${{ secrets.GITHUB_TOKEN }}
2020
ref: ${{ github.ref_name }}
21-
- name: Set up JDK
21+
- name: Setup JDK
2222
uses: actions/setup-java@v4
2323
with:
2424
distribution: 'adopt'
2525
java-version: ${{ matrix.java }}
26+
- name: Setup Gradle
27+
uses: gradle/actions/setup-gradle@v4
2628
- name: Publish Gradle plugins
27-
uses: gradle/actions/setup-gradle@v3
28-
with:
29-
arguments: :grace-gradle-plugin:publishPlugins
29+
run: ./gradlew :grace-gradle-plugin:publishPlugins
3030
env:
3131
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
3232
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}

‎.github/workflows/release-notes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
jobs:
1111
release_notes:
1212
if: ${{ github.repository == 'graceframework/grace-framework' }}
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Check if it has release drafter config file

‎.github/workflows/release.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
jobs:
1212
create_draft_release:
1313
if: ${{ github.repository == 'graceframework/grace-framework' }}
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1515
env:
1616
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1717
steps:
@@ -25,7 +25,7 @@ jobs:
2525
${{ github.ref_name }}
2626
release_and_publish:
2727
needs: create_draft_release
28-
runs-on: ubuntu-22.04
28+
runs-on: ubuntu-latest
2929
strategy:
3030
matrix:
3131
java: ['17']
@@ -38,11 +38,13 @@ jobs:
3838
with:
3939
token: ${{ secrets.GITHUB_TOKEN }}
4040
- uses: gradle/actions/wrapper-validation@v3
41-
- name: Set up JDK
41+
- name: Setup JDK
4242
uses: actions/setup-java@v4
4343
with:
4444
distribution: 'adopt'
4545
java-version: ${{ matrix.java }}
46+
- name: Setup Gradle
47+
uses: gradle/actions/setup-gradle@v4
4648
- name: Extract Target Branch
4749
id: extract_branch
4850
run: |
@@ -55,9 +57,7 @@ jobs:
5557
run: echo "release_version=${GITHUB_REF:11}" >> $GITHUB_OUTPUT
5658
- name: Run Assemble
5759
id: assemble
58-
uses: gradle/actions/setup-gradle@v3
59-
with:
60-
arguments: assemble
60+
run: ./gradlew assemble
6161
- name: Upload artifacts to the Github release
6262
id: upload_artifact
6363
if: steps.assemble.outcome == 'success'
@@ -73,7 +73,6 @@ jobs:
7373
- name: Publish to Sonatype OSSRH
7474
id: publish
7575
if: steps.assemble.outcome == 'success'
76-
uses: gradle/actions/setup-gradle@v3
7776
env:
7877
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
7978
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
@@ -82,5 +81,4 @@ jobs:
8281
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
8382
SIGNING_PASSPHRASE: ${{ secrets.SIGNING_PASSPHRASE }}
8483
SECRING_FILE: ${{ secrets.SECRING_FILE }}
85-
with:
86-
arguments: -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository
84+
run: ./gradlew -Psigning.secretKeyRingFile=${{ github.workspace }}/secring.gpg publishToSonatype closeAndReleaseSonatypeStagingRepository

‎.github/workflows/sdkman.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions: {}
88
jobs:
99
sdkman_release:
1010
if: ${{ github.repository == 'graceframework/grace-framework' }}
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
1414
java: ['17']
@@ -18,15 +18,15 @@ jobs:
1818
with:
1919
token: ${{ secrets.GITHUB_TOKEN }}
2020
ref: ${{ github.ref_name }}
21-
- name: Set up JDK
21+
- name: Setup JDK
2222
uses: actions/setup-java@v4
2323
with:
2424
distribution: 'adopt'
2525
java-version: ${{ matrix.java }}
26+
- name: Setup Gradle
27+
uses: gradle/actions/setup-gradle@v4
2628
- name: SDKMan release
27-
uses: gradle/actions/setup-gradle@v3
28-
with:
29-
arguments: sdkManRelease
29+
run: ./gradlew sdkManRelease
3030
env:
3131
SDKMAN_KEY: ${{ secrets.SDKMAN_KEY }}
3232
SDKMAN_TOKEN: ${{ secrets.SDKMAN_TOKEN }}

0 commit comments

Comments
 (0)