Skip to content

Commit be86950

Browse files
committed
update
1 parent 780e808 commit be86950

File tree

2 files changed

+39
-16
lines changed

2 files changed

+39
-16
lines changed

.github/workflows/ci.yml

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,43 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
java: [8, 11, 17, 21]
13-
scala: [2.11.x, 2.12.x, 2.13.x, 3.x]
12+
java: [ 8, 11, 17, 21 ]
13+
scala: [ 2.11.x, 2.12.x, 2.13.x, 3.x ]
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
17-
with:
18-
fetch-depth: 0
19-
- uses: coursier/cache-action@v6
20-
- uses: actions/setup-java@v3
21-
with:
22-
distribution: temurin
23-
java-version: ${{matrix.java}}
24-
- uses: sbt/setup-sbt@v1
25-
- name: Test
26-
run: |
27-
sbt ++${{matrix.scala}} test
28-
git diff --exit-code # check scalariform
16+
- uses: actions/checkout@v3
17+
with:
18+
fetch-depth: 0
19+
- uses: coursier/cache-action@v6
20+
- uses: actions/setup-java@v3
21+
with:
22+
distribution: temurin
23+
java-version: ${{matrix.java}}
24+
- uses: sbt/setup-sbt@v1
25+
- name: Test
26+
run: |
27+
sbt ++${{matrix.scala}} test
28+
git diff --exit-code # check scalariform
29+
30+
integration-test:
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
java: [ 8, 11, 17, 21 ]
35+
scala: [ .13.x, 3.x ]
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@v3
39+
with:
40+
fetch-depth: 0
41+
- uses: coursier/cache-action@v6
42+
- uses: actions/setup-java@v3
43+
with:
44+
distribution: temurin
45+
java-version: ${{matrix.java}}
46+
- uses: sbt/setup-sbt@v1
47+
- name: Test
48+
working-directory: integration-test
49+
run: |
50+
sbt ++${{matrix.scala}} test
51+
git diff --exit-code # check scalariform

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ val scalacOption = Def.setting {
1515
if (isScala3.value) Seq.empty else Seq("-language:_", "-Ywarn-unused")
1616
}
1717

18-
lazy val root = (project in file(".")).aggregate(core, scala2macros, `integration-test`)
18+
lazy val root = (project in file(".")).aggregate(core, scala2macros, `integration-test` % "compile->compile")
1919

2020
lazy val core = (project in file("core"))
2121
.enablePlugins(SbtOsgi)

0 commit comments

Comments
 (0)