Skip to content

Commit 794c85d

Browse files
authored
Merge pull request #2857 from armanbilge/topic/sbt-typelevel
Migrate to sbt-typelevel
2 parents 37e4c72 + 44bf4e1 commit 794c85d

File tree

12 files changed

+348
-185
lines changed

12 files changed

+348
-185
lines changed

.github/workflows/ci.yml

Lines changed: 56 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ on:
1212
branches: [series/3.*]
1313
push:
1414
branches: [series/3.*]
15+
tags: [v*]
1516

1617
env:
1718
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18-
JABBA_INDEX: 'https://github.com/typelevel/jdk-index/raw/main/index.json'
1919

2020
jobs:
2121
build:
@@ -24,25 +24,21 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest, windows-latest, macos-latest]
2626
scala: [3.0.2, 2.12.15, 2.13.7]
27-
java:
28-
- temurin@8
29-
- temurin@11
30-
- temurin@17
31-
- graal_21.3.0@11
27+
java: [temurin@8, temurin@11, temurin@17, graalvm@11]
3228
ci: [ciJVM, ciJS, ciFirefox, ciChrome]
3329
exclude:
3430
- scala: 3.0.2
3531
java: temurin@11
3632
- scala: 3.0.2
3733
java: temurin@17
3834
- scala: 3.0.2
39-
java: graal_21.3.0@11
35+
java: graalvm@11
4036
- scala: 2.12.15
4137
java: temurin@11
4238
- scala: 2.12.15
4339
java: temurin@17
4440
- scala: 2.12.15
45-
java: graal_21.3.0@11
41+
java: graalvm@11
4642
- os: windows-latest
4743
scala: 3.0.2
4844
- os: macos-latest
@@ -64,7 +60,7 @@ jobs:
6460
- ci: ciJS
6561
java: temurin@17
6662
- ci: ciJS
67-
java: graal_21.3.0@11
63+
java: graalvm@11
6864
- os: windows-latest
6965
ci: ciJS
7066
- os: macos-latest
@@ -74,7 +70,7 @@ jobs:
7470
- ci: ciFirefox
7571
java: temurin@17
7672
- ci: ciFirefox
77-
java: graal_21.3.0@11
73+
java: graalvm@11
7874
- os: windows-latest
7975
ci: ciFirefox
8076
- os: macos-latest
@@ -84,13 +80,13 @@ jobs:
8480
- ci: ciChrome
8581
java: temurin@17
8682
- ci: ciChrome
87-
java: graal_21.3.0@11
83+
java: graalvm@11
8884
- os: windows-latest
8985
ci: ciChrome
9086
- os: macos-latest
9187
ci: ciChrome
9288
- os: windows-latest
93-
java: graal_21.3.0@11
89+
java: graalvm@11
9490
runs-on: ${{ matrix.os }}
9591
steps:
9692
- name: Ignore line ending differences in git
@@ -99,37 +95,73 @@ jobs:
9995
run: git config --global core.autocrlf false
10096

10197
- name: Checkout current branch (full)
102-
uses: actions/checkout@v2
98+
uses: actions/checkout@v3
10399
with:
104100
fetch-depth: 0
105101

102+
- name: Download Java (temurin@8)
103+
id: download-java-temurin-8
104+
if: matrix.java == 'temurin@8'
105+
uses: typelevel/download-java@v1
106+
with:
107+
distribution: temurin
108+
java-version: 8
109+
106110
- name: Setup Java (temurin@8)
107111
if: matrix.java == 'temurin@8'
108112
uses: actions/setup-java@v2
109113
with:
110-
distribution: temurin
114+
distribution: jdkfile
111115
java-version: 8
116+
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
117+
118+
- name: Download Java (temurin@11)
119+
id: download-java-temurin-11
120+
if: matrix.java == 'temurin@11'
121+
uses: typelevel/download-java@v1
122+
with:
123+
distribution: temurin
124+
java-version: 11
112125

113126
- name: Setup Java (temurin@11)
114127
if: matrix.java == 'temurin@11'
115128
uses: actions/setup-java@v2
116129
with:
117-
distribution: temurin
130+
distribution: jdkfile
118131
java-version: 11
132+
jdkFile: ${{ steps.download-java-temurin-11.outputs.jdkFile }}
133+
134+
- name: Download Java (temurin@17)
135+
id: download-java-temurin-17
136+
if: matrix.java == 'temurin@17'
137+
uses: typelevel/download-java@v1
138+
with:
139+
distribution: temurin
140+
java-version: 17
119141

120142
- name: Setup Java (temurin@17)
121143
if: matrix.java == 'temurin@17'
122144
uses: actions/setup-java@v2
123145
with:
124-
distribution: temurin
146+
distribution: jdkfile
125147
java-version: 17
148+
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
126149

127-
- name: Setup GraalVM (graal_21.3.0@11)
128-
if: matrix.java == 'graal_21.3.0@11'
129-
uses: DeLaGuardo/[email protected]
150+
- name: Download Java (graalvm@11)
151+
id: download-java-graalvm-11
152+
if: matrix.java == 'graalvm@11'
153+
uses: typelevel/download-java@v1
130154
with:
131-
graalvm: 21.3.0
132-
java: java11
155+
distribution: graalvm
156+
java-version: 11
157+
158+
- name: Setup Java (graalvm@11)
159+
if: matrix.java == 'graalvm@11'
160+
uses: actions/setup-java@v2
161+
with:
162+
distribution: jdkfile
163+
java-version: 11
164+
jdkFile: ${{ steps.download-java-graalvm-11.outputs.jdkFile }}
133165

134166
- name: Cache sbt
135167
uses: actions/cache@v2
@@ -156,14 +188,14 @@ jobs:
156188

157189
- name: Check that workflows are up to date
158190
shell: bash
159-
run: sbt ++${{ matrix.scala }} githubWorkflowCheck
191+
run: sbt '++${{ matrix.scala }}' 'project /' githubWorkflowCheck
160192

161193
- shell: bash
162-
run: sbt ++${{ matrix.scala }} '${{ matrix.ci }}'
194+
run: sbt '++${{ matrix.scala }}' '${{ matrix.ci }}'
163195

164196
- if: (matrix.scala == '2.13.7' || matrix.scala == '3.0.2') && matrix.ci == 'ciJVM'
165197
shell: bash
166-
run: sbt ++${{ matrix.scala }} docs/mdoc
198+
run: sbt '++${{ matrix.scala }}' docs/mdoc
167199

168200
- name: Test Example JVM App Within Sbt
169201
if: matrix.ci == 'ciJVM' && matrix.os == 'ubuntu-latest'

0 commit comments

Comments
 (0)