Skip to content

Commit b35b689

Browse files
committed
use setup-java instead of deprecated olafurpg/setup-scala
1 parent 3dea845 commit b35b689

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ jobs:
1111

1212
steps:
1313
- uses: actions/checkout@v1
14-
- uses: olafurpg/setup-scala@v10
14+
- uses: actions/setup-java@v3
1515
with:
1616
java-version: 8
17+
distribution: adopt
1718
- name: Mount caches
1819
uses: actions/cache@v2
1920
with:
@@ -47,9 +48,10 @@ jobs:
4748

4849
steps:
4950
- uses: actions/checkout@v1
50-
- uses: olafurpg/setup-scala@v10
51+
- uses: actions/setup-java@v3
5152
with:
5253
java-version: 11
54+
distribution: adopt
5355
- name: Mount caches
5456
uses: actions/cache@v2
5557
with:
@@ -58,17 +60,22 @@ jobs:
5860
~/.ivy2/cache
5961
~/.cache/coursier
6062
key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}
63+
- name: download sbt
64+
run: |
65+
curl -sL https://raw.githubusercontent.com/sbt/sbt/85b18fa54832cd3d025973e86748fa834f0363f8/sbt -o sbt
66+
chmod +x ./sbt
67+
shell: bash
6168
- name: Compile and run scripted tests with older version
6269
if: ${{ matrix.scripted-sbt != 'project' }}
6370
env:
6471
SCRIPTED_SBT: ${{ matrix.scripted-sbt }}
6572
run: |
66-
sbt "set scriptedSbt := \"$SCRIPTED_SBT\"" scripted
73+
./sbt "set scriptedSbt := \"$SCRIPTED_SBT\"" scripted
6774
shell: bash
6875
- name: Compile and run scripted tests with project version
6976
if: ${{ matrix.scripted-sbt == 'project' }}
7077
run: |
71-
sbt "set scriptedSbt := sbtVersion.value" scripted
78+
./sbt "set scriptedSbt := sbtVersion.value" scripted
7279
shell: bash
7380
# Single final job for mergify.
7481
ci-passed:

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
~/.ivy2/cache
1919
~/.cache/coursier
2020
key: ${{ runner.os }}-sbt-docs-${{ hashFiles('**/*.sbt') }}
21-
- uses: actions/setup-java@v1
21+
- uses: actions/setup-java@v3
2222
with:
2323
java-version: 8
24+
distribution: adopt
2425
- name: Publish ${{ github.ref }}
2526
run: sbt ci-release
2627
env:

0 commit comments

Comments
 (0)