Skip to content

Commit b038fdd

Browse files
authored
Merge pull request #418 from 2m/fix/scala-setup-2m
Use latest scala setup action
2 parents 601c22d + f1726c8 commit b038fdd

2 files changed

Lines changed: 21 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ jobs:
1515
fail-fast: false
1616
steps:
1717
- uses: actions/checkout@v4
18-
- uses: coursier/cache-action@v6
19-
- uses: laughedelic/coursier-setup@v1
18+
- uses: actions/setup-java@v4
2019
with:
21-
jvm: adopt:11
22-
apps: sbtn
23-
- run: sbtn -v scalafixAll --check
24-
- run: sbtn -v scalafmtCheckAll
25-
- run: sbtn -v scalafmtSbtCheck
26-
- run: sbtn -v headerCheckAll
20+
distribution: temurin
21+
java-version: 17
22+
cache: sbt
23+
24+
- run: sbt --client scalafixAll --check
25+
- run: sbt --client scalafmtCheckAll
26+
- run: sbt --client scalafmtSbtCheck
27+
- run: sbt --client headerCheckAll
2728
- name: yaml-lint
2829
uses: ibiqlik/action-yamllint@v3
2930

@@ -34,13 +35,13 @@ jobs:
3435
fail-fast: false
3536
steps:
3637
- uses: actions/checkout@v4
37-
- uses: coursier/cache-action@v6
38-
- uses: laughedelic/coursier-setup@v1
38+
- uses: actions/setup-java@v4
3939
with:
40-
jvm: adopt:11
41-
apps: sbtn
40+
distribution: temurin
41+
java-version: 17
42+
cache: sbt
4243
- run: git submodule update --init
43-
- run: sbtn -v test
44+
- run: sbt --client test
4445
- uses: GabrielBB/xvfb-action@v1.6
4546
with:
4647
run: sbt scripted

.github/workflows/publish.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,13 @@ jobs:
1313
- uses: actions/checkout@v4
1414
with:
1515
fetch-depth: 0
16-
- uses: olafurpg/setup-scala@v14
16+
17+
- uses: actions/setup-java@v4
18+
with:
19+
distribution: temurin
20+
java-version: 17
21+
cache: sbt
22+
1723
- run: sbt ci-release
1824
env:
1925
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

0 commit comments

Comments
 (0)