Skip to content

Commit 48248ee

Browse files
authored
Merge pull request #215 from ProjectMapK/upd-actions
Update workflow
2 parents 50b1cf4 + 2071b03 commit 48248ee

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

.github/workflows/lint-and-test-dev.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
- "**.kt"
2929
- "**.java"
3030
- .github/workflows/lint-and-test-dev.yml
31+
32+
permissions:
33+
contents: write # for Dependency submission
34+
3135
jobs:
3236
lint-and-test-dev:
3337
name: lint-and-test-dev
@@ -39,20 +43,18 @@ jobs:
3943
- name: Checkout
4044
uses: actions/checkout@v4
4145
- name: Validate Gradle wrapper
42-
uses: gradle/wrapper-validation-action@v1
46+
uses: gradle/wrapper-validation-action@v2
4347
- name: Set up java
44-
uses: actions/setup-java@v3
48+
uses: actions/setup-java@v4
4549
with:
4650
java-version: '8'
4751
distribution: 'corretto'
48-
- name: Lint
49-
uses: gradle/gradle-build-action@v2
52+
- name: Setup Gradle
53+
uses: gradle/actions/setup-gradle@v3
5054
with:
51-
arguments: lintKotlin
55+
dependency-graph: generate-and-submit
56+
dependency-graph-continue-on-failure: false
57+
- name: Lint
58+
run: ./gradlew lintKotlin
5259
- name: Test
53-
uses: gradle/gradle-build-action@v2
54-
with:
55-
arguments: test
56-
# TODO: Prepare a separate WF to be executed only when there is a change in build.gradle.
57-
- name: Run snapshot action
58-
uses: mikepenz/[email protected]
60+
run: ./gradlew lintKotlin test

.github/workflows/test-main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ jobs:
6363
- name: Checkout
6464
uses: actions/checkout@v4
6565
- name: Validate Gradle wrapper
66-
uses: gradle/wrapper-validation-action@v1
66+
uses: gradle/wrapper-validation-action@v2
6767
- name: 'Set up java ${{ matrix.java-version }}'
68-
uses: actions/setup-java@v3
68+
uses: actions/setup-java@v4
6969
with:
7070
java-version: '${{ matrix.java-version }}'
7171
distribution: 'corretto'
72+
- name: Setup Gradle
73+
uses: gradle/actions/setup-gradle@v3
7274
- name: Test
73-
uses: gradle/gradle-build-action@v2
74-
with:
75-
arguments: test
75+
run: ./gradlew lintKotlin test

build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,11 @@ public val kogeraVersion: Version = VersionUtil.parseVersion("$version", "$group
9898
into(file("$generatedSrcPath/${packageStr.replace(".", "/")}"))
9999
}
100100

101+
// Added to avoid failure in generating dependency graphs in CI.
102+
lintKotlinMain {
103+
dependsOn.add(generateKogeraVersion)
104+
}
105+
101106
compileKotlin {
102107
dependsOn.add(generateKogeraVersion)
103108
kotlinOptions.jvmTarget = "1.8"

0 commit comments

Comments
 (0)