Skip to content

Commit 60ee9b9

Browse files
committed
- update GitHub actions
- use new `gradle/actions/setup-gradle` - block cancel-in-progress for publish.yml
1 parent cc49b5e commit 60ee9b9

File tree

2 files changed

+20
-17
lines changed

2 files changed

+20
-17
lines changed

.github/workflows/gradle.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
2929

3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- name: Set up JDK ${{ matrix.java-version }}
3434
uses: actions/setup-java@v3
@@ -37,17 +37,16 @@ jobs:
3737
java-version: ${{ matrix.java-version }}
3838

3939
- name: Validate Gradle wrapper
40-
uses: gradle/wrapper-validation-action@v1
40+
uses: gradle/wrapper-validation-action@v2
4141

4242
- name: Cache Kotlin Konan
43-
id: cache-kotlin-konan
44-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4544
with:
4645
path: ~/.konan/**/*
4746
key: kotlin-konan-${{ runner.os }}
4847

49-
- name: Test with Gradle
50-
uses: gradle/gradle-build-action@v2
51-
with:
52-
gradle-home-cache-cleanup: true
53-
arguments: build check --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
48+
- name: Set up Gradle
49+
uses: gradle/actions/setup-gradle@v3
50+
51+
- name: Publish
52+
run: ./gradlew check build --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}

.github/workflows/publish.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,36 @@ env:
99
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }}
1010
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }}
1111

12+
concurrency:
13+
group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
14+
# Don't cancel midway through publishing if another workflow is triggered, it might cause partial publications
15+
cancel-in-progress: false
16+
1217
jobs:
1318
publish:
1419
runs-on: macos-latest
15-
env:
16-
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
1720

1821
steps:
1922
- name: Checkout
20-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2124

2225
- name: Set up JDK
2326
uses: actions/setup-java@v4
2427
with:
2528
java-version: "11"
2629
distribution: "zulu"
27-
cache: "gradle"
30+
31+
- name: Validate Gradle wrapper
32+
uses: gradle/wrapper-validation-action@v2
2833

2934
- name: Cache Kotlin Konan
30-
id: cache-kotlin-konan
31-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3236
with:
3337
path: ~/.konan/**/*
3438
key: kotlin-konan-${{ runner.os }}
3539

36-
- name: Build
37-
uses: gradle/gradle-build-action@v2
40+
- name: Set up Gradle
41+
uses: gradle/actions/setup-gradle@v3
3842

3943
- name: Publish
4044
run: ./gradlew publish --no-parallel --stacktrace

0 commit comments

Comments
 (0)