Update Graal, Eclipse, use JDK 17 in CI

Signed-off-by: Stefan Marr <[email protected]>
SOM-st · Apr 11, 2022 · 00a1f9f · 00a1f9f
1 parent 64a07dc
commit 00a1f9f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
 
       - name: Tests
         run: |
-          export JAVA_HOME=$JAVA_HOME_8_X64
+          export JAVA_HOME=$JAVA_HOME_17_X64
           ant -e test
 
       - name: CheckStyle
@@ -23,7 +23,7 @@ jobs:
       - name: Download Eclipse
         run: |
           export ECLIPSE_TAR=eclipse.tar.gz
-          export ECLIPSE_URL=https://ftp.snt.utwente.nl/pub/software/eclipse/eclipse/downloads/drops4/R-4.19-202103031800/eclipse-SDK-4.19-linux-gtk-x86_64.tar.gz
+          export ECLIPSE_URL=https://ftp.snt.utwente.nl/pub/software/eclipse/eclipse/downloads/drops4/R-4.23-202203080310/eclipse-SDK-4.23-linux-gtk-x86_64.tar.gz
           curl ${ECLIPSE_URL} -o ${ECLIPSE_TAR}
           tar -C ${GITHUB_WORKSPACE}/.. -xzf ${ECLIPSE_TAR}
 

diff --git a/.graal-git-repo b/.graal-git-repo
@@ -11,12 +11,12 @@ import sys
 import os
 
 # We use the following repositories
-GRAAL_REPO_URL = "https://github.com/smarr/truffle.git"
+GRAAL_REPO_URL = "https://github.com/oracle/graal.git"
 MX_REPO_URL    = "https://github.com/graalvm/mx.git"
 
 # And these are the repo revisions we test against
-GRAAL_REPO_REV = "60bdbbd657e21d98fa0e6141fe3f4a786010b9e8"
-MX_REPO_REV    = "7ffcabe734973b89f0211da3a174ac2d298c78bc"
+GRAAL_REPO_REV = "91b68c2bcb9a0f41c0f437b6d7adf736786f36b6"
+MX_REPO_REV    = "65c6727a0080515696c25934f3da02ef7a1aa43a"
 
 
 def update(lines, var, val):

diff --git a/build.xml b/build.xml
@@ -1,18 +1,15 @@
 <project name="black-diamonds" basedir="." default="compile"
     xmlns:if="ant:if"
     xmlns:jacoco="antlib:org.jacoco.ant">
-
-    <property name="force.java8" value="false" />  <!-- the default value,
-       can be changed by simply setting the property when calling ant -->
 
     <property name="src.dir"     location="src"/>
     <property name="src_gen.dir" location="src_gen"/>
     <property name="test.dir"    value="tests"/>
     <property name="lib.dir"     value="libs"/>
     <property name="sdk.dir"     value="graal/sdk" />
-    <property name="sdk.build"   value="${sdk.dir}/mxbuild/dists/jdk1.8" />
+    <property name="sdk.build"   value="${sdk.dir}/mxbuild/dists" />
     <property name="truffle.dir" value="graal/truffle" />
-    <property name="truffle.build" value="${truffle.dir}/mxbuild/dists/jdk1.8" />
+    <property name="truffle.build" value="${truffle.dir}/mxbuild/dists" />
     <property name="junit.version" value="4.12" />
     <property name="jacoco.version" value="0.8.0" />
 
@@ -159,17 +156,14 @@
           <compilerarg line="-s ${src_gen.dir}" />
           <compilerarg line="-XDignore.symbol.file" />
           <compilerarg line="-Xlint:all" />
-          <compilerarg line="--release 8" if:true="${force.java8}" />
         </javac>
         <javac includeantruntime="false" srcdir="${src_gen.dir}" destdir="${classes.dir}" debug="true">
           <classpath refid="project.classpath" />
           <compilerarg line="-s ${src_gen.dir}" />
           <compilerarg line="-Xlint:all" />
-          <compilerarg line="--release 8" if:true="${force.java8}" />
         </javac>
         <javac includeantruntime="false" srcdir="${test.dir}" destdir="${classes.dir}" debug="true">
           <classpath refid="project.classpath" />
-          <compilerarg line="--release 8" if:true="${force.java8}" />
         </javac>
     </target>