Skip to content

Commit 909e502

Browse files
committed
tests: Update GraalVM to 21.1.0
Drop native image testing for JDK8. It is no longer an option for macOS and we did not test on Windows due to complexity of setup. So we now only currently test native image for JDK11. Drop native-image --enable-all-security-services, no longer needed and deprecated. Update fail fast check for Graal version. The native-image cmd changed text format for --version so we adapt.
1 parent be07873 commit 909e502

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ jobs:
88
strategy:
99
matrix:
1010
os: [ windows-latest, ubuntu-latest, macos-latest ]
11-
graal-java: [ java8, java11 ]
11+
graal-java: [ java11 ]
1212
test: [ pure, sci ]
13-
exclude:
14-
- os: windows-latest
15-
graal-java: java8
1613

1714
name: ${{ matrix.os }},${{ matrix.graal-java }},${{ matrix.test }}
1815

@@ -46,7 +43,7 @@ jobs:
4643
- name: Install GraalVM
4744
uses: DeLaGuardo/[email protected]
4845
with:
49-
graalvm: '21.0.0.2'
46+
graalvm: '21.1.0'
5047
java: ${{ matrix.graal-java }}
5148

5249
#

doc/02-developer-guide.adoc

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

1515
We test that rewrite-clj operates as expected when natively compile via GraalVM.
16-
Automated testing is setup using GraalVM v21 for both JDK8 and JDK11.
17-
On Windows we only test against JDK11 as tool setup for JDK8 on Windows seemed overly arduous.
16+
Automated testing is setup using GraalVM v21 JDK11.
1817

1918
== Prerequisites
2019
* Java JDK 1.8 or above
2120
* NodeJs v12 or above
2221
* Clojure v1.10.1.697 or above for `clojure` command
2322
** Note that rewrite-clj v1 itself supports Clojure v1.9 and above
2423
* Babashka v0.3.2 or above
25-
* GraalVM v21.0.0 (if you want to run GraalVM native image tests)
24+
* GraalVM v21.1.0 JDK 11 (if you want to run GraalVM native image tests)
2625

2726
=== Windows Notes
2827

@@ -53,7 +52,6 @@ Rename-Item $HOME\deps.clj\deps.exe clojure.exe
5352

5453
==== GraalVM
5554
You'll have your own preference, but I find it convenient to install GraalVM on Windows via scoop.
56-
Both `graalvm11` and `graalvm8` are available.
5755

5856
You'll need to load the appropriate Visual C++ environment variables for GraalVM's native-image to do its work.
5957
I found it oddly cumbersome to load them from PowerShell, so I work from a cmd shell instead.
@@ -64,8 +62,6 @@ Here's what works on my Windows dev environment:
6462
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
6563
----
6664

67-
And finally, I never did figure out how to get the Windows prerequisites setup for the JDK8 version of GraalVM, so I only test on the JDK11 version.
68-
6965
== Setup
7066
After checking out this project from GitHub,
7167

script/helper/graal.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
version-out (->> (shell/command [native-image-exe "--version"] {:out :string})
2323
:out)
2424
actual-major (->> version-out
25-
(re-find #"(?i)version (\d+)\.")
25+
(re-find #"(?i)GraalVM (Version )?(\d+)\.")
2626
last
2727
Long/parseLong)]
2828
(when (< actual-major min-major)
@@ -87,7 +87,6 @@
8787
"--initialize-at-build-time"
8888
"-H:Log=registerResource:"
8989
"-H:EnableURLProtocols=http,https,jar"
90-
"--enable-all-security-services"
9190
"--verbose"
9291
"-H:ServiceLoaderFeatureExcludeServices=javax.sound.sampled.spi.AudioFileReader"
9392
"-H:ServiceLoaderFeatureExcludeServices=javax.sound.midi.spi.MidiFileReader"

0 commit comments

Comments
 (0)