mirror of
https://github.com/enso-org/enso.git
synced 2024-12-23 15:21:48 +03:00
Bump the GraalVM version and fix CI (#195)
This commit is contained in:
parent
a6e869e05d
commit
6e9c557682
@ -17,7 +17,8 @@ trigger:
|
||||
pr: none
|
||||
|
||||
variables:
|
||||
graalVersion: 19.2.0
|
||||
graalVersion: 19.2.0.1 # Please ensure this is in sync with the graalAPIVersion in build.sbt
|
||||
sbtVersion: 1.2.8 # Please ensure this is in sync with project/build.properties
|
||||
historicMacOSSbtFormula: https://raw.githubusercontent.com/Homebrew/homebrew-core/5311047af872538de3bd9fa10d78eda3185a7559/Formula/sbt.rb
|
||||
|
||||
jobs:
|
||||
@ -32,8 +33,9 @@ jobs:
|
||||
- script: /tmp/docker exec -t -u 0 ci-container sh -c "yum install -y sudo"
|
||||
displayName: Setup sudo
|
||||
- script: |
|
||||
curl https://bintray.com/sbt/rpm/rpm | sudo tee /etc/yum.repos.d/bintray-sbt-rpm.repo
|
||||
sudo yum install -y sbt
|
||||
curl -fSL -o sbt.tgz https://piccolo.link/sbt-$(sbtVersion).tgz
|
||||
tar -x -z -C ~ -f sbt.tgz
|
||||
echo "##vso[task.setvariable variable=PATH]~/sbt/bin/:$PATH"
|
||||
displayName: "Install sbt"
|
||||
- script: |
|
||||
sbt -no-colors test
|
||||
@ -69,8 +71,9 @@ jobs:
|
||||
echo "##vso[task.setvariable variable=PATH]/Library/Java/JavaVirtualMachines/graalvm-ce-$(graalVersion)/Contents/Home/bin:$PATH"
|
||||
displayName: Install GraalVM
|
||||
- script: |
|
||||
brew update
|
||||
brew install $(historicMacOSSbtFormula)
|
||||
curl -fSL -o sbt.tgz https://piccolo.link/sbt-$(sbtVersion).tgz
|
||||
tar -x -z -C ~ -f sbt.tgz
|
||||
echo "##vso[task.setvariable variable=PATH]~/sbt/bin/:$PATH"
|
||||
displayName: Install sbt
|
||||
- script: |
|
||||
sbt -no-colors test
|
||||
@ -102,15 +105,17 @@ jobs:
|
||||
7z x -y -oC:\ graal.zip
|
||||
displayName: "Install GraalVM"
|
||||
- script: |
|
||||
choco install -y sbt
|
||||
curl -fSL -o sbt.tgz https://piccolo.link/sbt-$(sbtVersion).tgz
|
||||
tar -x -z -C %USERPROFILE% -f sbt.tgz
|
||||
displayName: "Install sbt"
|
||||
- script: |
|
||||
call refreshenv
|
||||
echo ##vso[task.setvariable variable=JAVA_HOME]C:\graalvm-ce-$(graalVersion)
|
||||
echo ##vso[task.setvariable variable=PATH]C:\graalvm-ce-$(graalVersion)\bin;%PATH%
|
||||
call refreshenv
|
||||
echo ##vso[task.setvariable variable=JAVA_HOME]C:\graalvm-ce-$(graalVersion)
|
||||
echo ##vso[task.setvariable variable=PATH]C:\graalvm-ce-$(graalVersion)\bin;%PATH%
|
||||
echo ##vso[task.setvariable variable=PATH]%USERPROFILE%\sbt\bin\;%PATH%
|
||||
displayName: "Adjust environment variables"
|
||||
- script: |
|
||||
sbt test
|
||||
sbt.bat test
|
||||
continueOnError: true
|
||||
displayName: "sbt test"
|
||||
- script: |
|
||||
|
13
build.sbt
13
build.sbt
@ -8,6 +8,7 @@ import org.enso.build.WithDebugCommand
|
||||
//////////////////////////////
|
||||
|
||||
val scalacVersion = "2.12.8"
|
||||
val graalVersion = "19.2.0.1"
|
||||
organization in ThisBuild := "org.enso"
|
||||
scalaVersion in ThisBuild := scalacVersion
|
||||
|
||||
@ -222,12 +223,12 @@ 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.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.graalvm.sdk" % "graal-sdk" % graalVersion,
|
||||
"org.graalvm.sdk" % "polyglot-tck" % graalVersion,
|
||||
"org.graalvm.truffle" % "truffle-api" % graalVersion,
|
||||
"org.graalvm.truffle" % "truffle-dsl-processor" % graalVersion,
|
||||
"org.graalvm.truffle" % "truffle-tck" % graalVersion,
|
||||
"org.graalvm.truffle" % "truffle-tck-common" % graalVersion,
|
||||
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4",
|
||||
"org.scalacheck" %% "scalacheck" % "1.14.0" % Test,
|
||||
"org.scalactic" %% "scalactic" % "3.0.8" % Test,
|
||||
|
@ -54,7 +54,7 @@ below may provide more rules for use in specific cases.
|
||||
temporary data in a function.
|
||||
- Names should be descriptive, even if this makes them longer.
|
||||
|
||||
## Package structure and naming
|
||||
## Package Structure and Naming
|
||||
Enso follows the
|
||||
[Java convention for naming packages](https://docs.oracle.com/javase/tutorial/java/package/namingpkgs.html):
|
||||
package name components may contain only lower case characters and, if
|
||||
|
Loading…
Reference in New Issue
Block a user