Skip to content

Commit 1f46b6b

Browse files
authored
Merge branch 'main' into update/scala-library-2.13.18
2 parents b78bcd7 + e0947bb commit 1f46b6b

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v2
1111
- uses: coursier/cache-action@v6
12-
- uses: olafurpg/setup-scala@v11
12+
- uses: actions/setup-java@v4
1313
with:
14-
java-version: zulu@1.11
14+
java-version: 11
15+
distribution: zulu
16+
- uses: sbt/setup-sbt@v1
1517
- run: sbt ++${{ matrix.scala }} clean scalafmtSbtCheck scalafmtCheck test doc
1618
if: startsWith(matrix.scala, '3')
1719
- run: sbt ++${{ matrix.scala }} clean scalafmtSbtCheck scalafmtCheck coverage test doc coverageReport coveralls

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ jobs:
1010
- uses: actions/checkout@v2.3.4
1111
with:
1212
fetch-depth: 0
13-
- uses: olafurpg/setup-scala@v11
13+
- uses: actions/setup-java@v4
1414
with:
15-
java-version: zulu@1.11
15+
java-version: 11
16+
distribution: zulu
17+
- uses: sbt/setup-sbt@v1
1618
- run: sbt ci-release
1719
env:
1820
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

0 commit comments

Comments
 (0)