Skip to content

Commit 9afda2f

Browse files
boris-spasboris-spas
committed
Merge pull request graalvm#5 in G/simpletool from update-19.3.0 to master
* commit '5e3f75af3f6f33b4f442294ead895fa58c0f9e5c': Update Travis to download correct GraalVM and run with jdk11 version. Update to 19.3.0
2 parents 7492bc6 + 5e3f75a commit 9afda2f

File tree

4 files changed

+72
-18
lines changed

4 files changed

+72
-18
lines changed

‎.travis.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,18 @@ os:
55
language: java
66

77
env:
8-
- GRAALVM_VERSION="19.2.0"
8+
- GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="8"
9+
- GRAALVM_VERSION="19.3.0" GRAALVM_JAVA_VERSION="11"
910

1011
install:
12+
- cd .. && mv simpletool "simple tool" && cd "simple tool"
1113
- |
12-
cd .. && mv simpletool "simple tool" && cd "simple tool"
13-
if [[ "$GRAALVM_VERSION" != "NONE" ]]; then
14-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then DOWNLOAD_OS_NAME="darwin"; fi
15-
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then DOWNLOAD_OS_NAME="linux"; fi
16-
curl -LJ "https://github.com/oracle/graal/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-$DOWNLOAD_OS_NAME-amd64-$GRAALVM_VERSION.tar.gz" --output graalvm.tar.gz
17-
tar -xzf graalvm.tar.gz
18-
export JAVA_HOME="$(pwd)/graalvm-ce-$GRAALVM_VERSION"
19-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME="$JAVA_HOME/Contents/Home"; fi
20-
else
21-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME=$(/usr/libexec/java_home); fi
22-
fi
14+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then DOWNLOAD_OS_NAME="darwin"; fi
15+
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then DOWNLOAD_OS_NAME="linux"; fi
16+
curl -LJ "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-$GRAALVM_VERSION/graalvm-ce-java$GRAALVM_JAVA_VERSION-$DOWNLOAD_OS_NAME-amd64-$GRAALVM_VERSION.tar.gz" --output graalvm.tar.gz
17+
tar -xzf graalvm.tar.gz
18+
export JAVA_HOME="$(pwd)/graalvm-ce-java$GRAALVM_JAVA_VERSION-$GRAALVM_VERSION"
19+
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export JAVA_HOME="$JAVA_HOME/Contents/Home"; fi
2320
2421
script:
2522
- mvn package

‎ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
local graalvm = {
1313
downloads+: {
14-
JAVA_HOME: { name: 'graalvm', version: '19.2.0', platformspecific: true },
14+
JAVA_HOME: { name: 'graalvm', version: '19.3.0', platformspecific: true },
1515
},
1616
},
1717

‎pom.xml

Lines changed: 61 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,68 @@
44

55
<groupId>com.oracle</groupId>
66
<artifactId>simpletool</artifactId>
7-
<version>19.2.0</version>
7+
<version>19.3.0</version>
88

99
<name>simpletool</name>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.compiler.source>1.8</maven.compiler.source>
1414
<maven.compiler.target>1.8</maven.compiler.target>
15-
<graalvm.version>19.2.0</graalvm.version>
15+
<graalvm.version>19.3.0</graalvm.version>
1616
</properties>
17-
17+
<profiles>
18+
<profile>
19+
<id>jdk11-graalvm</id>
20+
<activation>
21+
<jdk>[11,</jdk>
22+
</activation>
23+
<properties>
24+
<jar.dir>${project.build.directory}/jars</jar.dir>
25+
<test.argLine>--upgrade-module-path=${jar.dir}/truffle-api.jar</test.argLine>
26+
</properties>
27+
<build>
28+
<plugins>
29+
<plugin>
30+
<groupId>org.apache.maven.plugins</groupId>
31+
<artifactId>maven-dependency-plugin</artifactId>
32+
<version>2.10</version>
33+
<executions>
34+
<execution>
35+
<id>copy</id>
36+
<phase>process-test-classes</phase>
37+
<goals>
38+
<goal>copy</goal>
39+
</goals>
40+
<configuration>
41+
<artifactItems>
42+
<artifactItem>
43+
<groupId>org.graalvm.truffle</groupId>
44+
<artifactId>truffle-api</artifactId>
45+
<version>${graalvm.version}</version>
46+
<type>jar</type>
47+
<overWrite>true</overWrite>
48+
<destFileName>truffle-api.jar</destFileName>
49+
</artifactItem>
50+
</artifactItems>
51+
<outputDirectory>${jar.dir}</outputDirectory>
52+
</configuration>
53+
</execution>
54+
</executions>
55+
</plugin>
56+
</plugins>
57+
</build>
58+
</profile>
59+
<profile>
60+
<id>jdk8-graalvm</id>
61+
<activation>
62+
<jdk>1.8</jdk>
63+
</activation>
64+
<properties>
65+
<test.argLine>-XX:-UseJVMCIClassLoader</test.argLine>
66+
</properties>
67+
</profile>
68+
</profiles>
1869
<dependencies>
1970
<dependency>
2071
<groupId>junit</groupId>
@@ -32,6 +83,12 @@
3283
<artifactId>truffle-dsl-processor</artifactId>
3384
<version>${graalvm.version}</version>
3485
</dependency>
86+
<dependency>
87+
<groupId>org.graalvm.js</groupId>
88+
<artifactId>js</artifactId>
89+
<version>${graalvm.version}</version>
90+
<scope>test</scope>
91+
</dependency>
3592
</dependencies>
3693

3794
<build>
@@ -47,7 +104,7 @@
47104
<version>2.9</version>
48105
<configuration>
49106
<!--Disables classpath issolation making testing simpler, not for use in production scenarios -->
50-
<argLine>-XX:-UseJVMCIClassLoader</argLine>
107+
<argLine>-Dgraalvm.locatorDisabled=true ${test.argLine}</argLine>
51108
</configuration>
52109
</plugin>
53110
</plugins>

‎simpletool

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ shift
1515

1616
"$JAVA_HOME/bin/$LAUNCHER" \
1717
--jvm \
18-
--vm.Dtruffle.class.path.append=target/simpletool-19.2.0.jar \
18+
--vm.Dtruffle.class.path.append=target/simpletool-19.3.0.jar \
1919
--simple-code-coverage \
2020
"$@"

0 commit comments

Comments
 (0)