Skip to content

Commit d5dec6f

Browse files
authored
test: bump GraalVM JDK to 21 (#243)
Drop testing for GraalVM JDK 17 and 20. GraalVM JDK 21 returns version as major-only, which is a bit odd. Had to adjust some version parsing here and in sci-test.
1 parent 285c919 commit d5dec6f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/native-image-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os: [ windows, ubuntu, macos ]
20-
java-version: [ '17.0.8', '20.0.2' ]
20+
java-version: [ '21' ]
2121
test: [ native, native-sci ]
2222
clojure-version: [ '1.11' ]
2323

deps.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@
114114

115115

116116
:sci-test {:extra-paths ["target/generated/sci-test/src"]
117-
:extra-deps {lread/sci-test_{:git/url "https://github.com/lread/sci-test.git"
118-
:sha "78e098353d5cce878b8aec1767ae290a3d2fcee9"}}}
117+
:extra-deps {lread/sci-test {:git/url "https://github.com/lread/sci-test.git"
118+
:sha "4323578406848180424a801018047fe859e72c4b"}}}
119119

120120
:native-test {:extra-paths ["target/generated/graal"]}
121121

doc/02-developer-guide.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ We make use of planck for cljs bootstrap (aka cljs self-hosted) testing.
1212
Planck is currently not available for Windows.
1313

1414
We test that rewrite-clj operates as expected when natively compile via GraalVM.
15-
Automated testing is setup using GraalVM JDK 17 and JDK 20.
15+
Automated testing is setup using GraalVM JDK 21.
1616
At this time we only test against the Community Edition.
1717

1818
== Prerequisites
@@ -21,7 +21,7 @@ At this time we only test against the Community Edition.
2121
* Clojure v1.10.1.697 or above for `clojure` command
2222
** Note that rewrite-clj v1 itself supports Clojure v1.8 and above
2323
* Babashka v0.3.7 or above
24-
* Current release of GraalVM JDK 17 or 20, if you want to run GraalVM native image tests
24+
* Current release of GraalVM JDK 21, if you want to run GraalVM native image tests
2525

2626
=== Windows Notes
2727

script/helper/graal.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
version-out (->> (shell/command {:err :string} java-exe "-version")
2020
:err)
2121
[actual-graal-major actual-jdk-major] (->> version-out
22-
(re-find #"(?i)GraalVM(?: CE)? (\d+)\..*\(build (\d+)\.")
22+
(re-find #"(?i)GraalVM(?: CE)? (\d+).*\(build (\d+)")
2323
rest
2424
(map parse-long))]
2525
(cond

0 commit comments

Comments
 (0)