Skip to content

Commit 256f329

Browse files
authored
Merge pull request #498 from scala-js/topic/setup-everything-scala
Use GitHub Action: japgolly/setup-everything-scala
2 parents 2227462 + bcbf642 commit 256f329

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

.github/workflows/ci.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ jobs:
2323
steps:
2424

2525
- uses: actions/checkout@v2
26-
- uses: olafurpg/setup-scala@v13
27-
with:
28-
java-version: "[email protected]"
29-
- uses: coursier/cache-action@v6
26+
27+
- name: Setup Scala
28+
uses: japgolly/[email protected]
3029

3130
- name: Hacks for Scala 2.10
3231
if: matrix.scalaversion == '2.10.7'
@@ -52,9 +51,6 @@ jobs:
5251
runs-on: ubuntu-latest
5352
steps:
5453
- uses: actions/checkout@v2
55-
- uses: olafurpg/setup-scala@v13
56-
with:
57-
java-version: "[email protected]"
58-
- uses: coursier/cache-action@v6
54+
- uses: japgolly/[email protected]
5955
- name: Readme generation
6056
run: sbt readme/run

.github/workflows/ghpages.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v2
14-
- uses: olafurpg/setup-scala@v13
15-
with:
16-
java-version: "[email protected]"
17-
- uses: coursier/cache-action@v6
14+
15+
- name: Setup Scala
16+
uses: japgolly/[email protected]
1817

1918
- name: Build
2019
run: sbt readme/run

.github/workflows/release.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,19 @@ jobs:
1212
env:
1313
SCALAJS_VERSION: "${{ matrix.scalajsversion == '0.6.x' && '0.6.28' || '' }}"
1414
steps:
15+
1516
- uses: actions/checkout@v2
1617
with:
1718
fetch-depth: 0
18-
- uses: olafurpg/setup-scala@v13
19+
20+
- name: Setup Scala
21+
uses: japgolly/[email protected]
22+
1923
- name: Hacks for Scala 2.10
2024
run: ./prepareForScala210.sh
21-
- run: sbt ci-release
25+
26+
- name: Release
27+
run: sbt ci-release
2228
env:
2329
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
2430
PGP_SECRET: ${{ secrets.PGP_SECRET }}

0 commit comments

Comments
 (0)