Skip to content

Commit 5149b6e

Browse files
Add jdk17 build (#235)
- Add JDK17 actions - Split actions into 1 per lang/jdk version
1 parent a5c3bc2 commit 5149b6e

2 files changed

Lines changed: 23 additions & 11 deletions

File tree

.github/workflows/pr-build.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,28 @@ on:
88

99
jobs:
1010
build:
11-
1211
runs-on: ubuntu-latest
1312
strategy:
1413
fail-fast: false
14+
matrix:
15+
lang: ['jvm', 'js', 'native']
16+
java: ['11', '17']
1517
env:
1618
# Set LANG=C to simulate least-common-denominator target deployment environments:
1719
LANG: C
18-
20+
name: Sjsonnet build for ${{ matrix.lang }} on JDK ${{ matrix.java }}
1921
steps:
20-
- uses: actions/checkout@v2
21-
- name: Set up JDK 11
22-
uses: actions/setup-java@v2
22+
- uses: actions/checkout@v4
23+
- name: Set up JDK ${{ matrix.java }}
24+
uses: actions/setup-java@v4
2325
with:
24-
java-version: '11'
25-
distribution: 'adopt'
26-
- name: Run mill tests
27-
run: ./mill __.test
26+
java-version: ${{ matrix.java }}
27+
distribution: 'zulu'
28+
- name: Run mill tests for ${{ matrix.lang }}
29+
run: ./mill _.${{ matrix.lang }}[_].test
2830
- name: Compile with sbt
31+
if: ${{ matrix.lang == 'jvm' }}
2932
run: sbt compile bench/compile bench/jmh:compile
3033
- name: Run sbt tests
34+
if: ${{ matrix.lang == 'jvm' }}
3135
run: sbt test

sjsonnet/test/src-jvm/sjsonnet/StdGzipTests.scala

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ import utest._
66
object StdGzipTests extends TestSuite {
77
val tests = Tests {
88
test("gzip"){
9-
eval("""std.gzip([1, 2])""") ==> ujson.Str("H4sIAAAAAAAAAGNkAgCSQsy2AgAAAA==")
10-
eval("""std.gzip("hi")""") ==> ujson.Str("H4sIAAAAAAAAAMvIBACsKpPYAgAAAA==")
9+
eval("""std.gzip([1, 2])""") ==> ujson.Str(Runtime.version().feature() match {
10+
// https://bugs.openjdk.org/browse/JDK-8244706
11+
case s if s >= 16 => "H4sIAAAAAAAA/2NkAgCSQsy2AgAAAA=="
12+
case _ => "H4sIAAAAAAAAAGNkAgCSQsy2AgAAAA=="
13+
})
14+
eval("""std.gzip("hi")""") ==> ujson.Str(Runtime.version().feature() match {
15+
// https://bugs.openjdk.org/browse/JDK-8244706
16+
case s if s >= 16 => "H4sIAAAAAAAA/8vIBACsKpPYAgAAAA=="
17+
case _ => "H4sIAAAAAAAAAMvIBACsKpPYAgAAAA=="
18+
})
1119
}
1220
}
1321
}

0 commit comments

Comments
 (0)