From 5316ffb01190be8b13743c8e20f4e408800bcaaf Mon Sep 17 00:00:00 2001 From: Marcin Kostrzewa Date: Mon, 26 Aug 2019 13:03:01 +0200 Subject: [PATCH] Bump Graal to 19.2.0 (#105) --- azure-pipelines.yml | 21 ++++++++++++--------- build.sbt | 16 +++++++--------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a4eb73f6e31..0ea184061e8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,12 +16,15 @@ trigger: pr: none +variables: + graalVersion: 19.2.0 + jobs: - job: Linux pool: vmImage: 'Ubuntu-16.04' container: - image: oracle/graalvm-ce:19.0.0 + image: oracle/graalvm-ce:$(graalVersion) options: "--name ci-container -v /usr/bin/docker:/tmp/docker:ro" steps: - script: /tmp/docker exec -t -u 0 ci-container sh -c "yum install -y sudo" @@ -51,12 +54,12 @@ jobs: vmImage: macOS-10.13 steps: - script: | - curl -fSL -o graal.tar.gz https://github.com/oracle/graal/releases/download/vm-19.1.0/graalvm-ce-darwin-amd64-19.1.0.tar.gz + curl -fSL -o graal.tar.gz https://github.com/oracle/graal/releases/download/vm-$(graalVersion)/graalvm-ce-darwin-amd64-$(graalVersion).tar.gz tar -x -z -C ~ -f graal.tar.gz - ls ~/graalvm-ce-19.1.0 - sudo mv ~/graalvm-ce-19.1.0 /Library/Java/JavaVirtualMachines - echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/graalvm-ce-19.1.0/Contents/Home" - echo "##vso[task.setvariable variable=PATH]/Library/Java/JavaVirtualMachines/graalvm-ce-19.1.0/Contents/Home/bin:$PATH" + ls ~/graalvm-ce-$(graalVersion) + sudo mv ~/graalvm-ce-$(graalVersion) /Library/Java/JavaVirtualMachines + echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/graalvm-ce-$(graalVersion)/Contents/Home" + echo "##vso[task.setvariable variable=PATH]/Library/Java/JavaVirtualMachines/graalvm-ce-$(graalVersion)/Contents/Home/bin:$PATH" displayName: Install GraalVM - script: | brew update @@ -83,7 +86,7 @@ jobs: vmImage: windows-2019 steps: - script: | - curl -fSL -o graal.zip https://github.com/oracle/graal/releases/download/vm-19.0.0/graalvm-ce-windows-amd64-19.0.0.zip + curl -fSL -o graal.zip https://github.com/oracle/graal/releases/download/vm-$(graalVersion)/graalvm-ce-windows-amd64-$(graalVersion).zip 7z x -y -oC:\ graal.zip displayName: "Install GraalVM" - script: | @@ -91,8 +94,8 @@ jobs: displayName: "Install sbt" - script: | call refreshenv - echo ##vso[task.setvariable variable=JAVA_HOME]C:\graalvm-ce-19.0.0 - echo ##vso[task.setvariable variable=PATH]C:\graalvm-ce-19.0.0\bin;%PATH% + echo ##vso[task.setvariable variable=JAVA_HOME]C:\graalvm-ce-$(graalVersion) + echo ##vso[task.setvariable variable=PATH]C:\graalvm-ce-$(graalVersion)\bin;%PATH% displayName: "Adjust environment variables" - script: | sbt test diff --git a/build.sbt b/build.sbt index 64186abac2c..dd03aec5d08 100644 --- a/build.sbt +++ b/build.sbt @@ -74,7 +74,6 @@ lazy val pkg = (project in file("Pkg")) val truffleRunOptions = Seq( fork := true, - javaOptions += s"-Dtruffle.class.path.append=${(Compile / classDirectory).value}", javaOptions += s"-Dgraal.TruffleIterativePartialEscape=true", javaOptions += s"-XX:-UseJVMCIClassLoader", javaOptions += s"-Dgraal.TruffleBackgroundCompilation=false" @@ -105,18 +104,17 @@ lazy val interpreter = (project in file("Interpreter")) "com.chuusai" %% "shapeless" % "2.3.3", "org.apache.commons" % "commons-lang3" % "3.9", "org.apache.tika" % "tika-core" % "1.21", - "org.graalvm.sdk" % "graal-sdk" % "19.0.0", - "org.graalvm.sdk" % "polyglot-tck" % "19.0.0", - "org.graalvm.truffle" % "truffle-api" % "19.0.0", - "org.graalvm.truffle" % "truffle-dsl-processor" % "19.0.0", - "org.graalvm.truffle" % "truffle-nfi" % "19.0.0", - "org.graalvm.truffle" % "truffle-tck" % "19.0.0", - "org.graalvm.truffle" % "truffle-tck-common" % "19.0.0", + "org.graalvm.sdk" % "graal-sdk" % "19.2.0", + "org.graalvm.sdk" % "polyglot-tck" % "19.2.0", + "org.graalvm.truffle" % "truffle-api" % "19.2.0", + "org.graalvm.truffle" % "truffle-dsl-processor" % "19.2.0", + "org.graalvm.truffle" % "truffle-tck" % "19.2.0", + "org.graalvm.truffle" % "truffle-tck-common" % "19.2.0", "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4", "org.scalacheck" %% "scalacheck" % "1.14.0" % Test, "org.scalactic" %% "scalactic" % "3.0.8" % Test, "org.scalatest" %% "scalatest" % "3.2.0-SNAP10" % Test, - "org.typelevel" %% "cats-core" % "2.0.0-M4", + "org.typelevel" %% "cats-core" % "2.0.0-M4" ), libraryDependencies ++= jmh )