Skip to content

Commit

Permalink
Update ci to match the rename of public_maven to external_repos.
Browse files Browse the repository at this point in the history
  • Loading branch information
boris-spas committed Mar 13, 2020
1 parent b65fb65 commit f89d036
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions truffle/ci.hocon
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ simpleToolMavenProjectGate: {
["mx", "maven-deploy", "--all-suites", "--all-distribution-types", "--version-string", ["mx", "-p", "../vm", "graalvm-version"]],
["mx", "-p", "../vm", "--java-home", "$JDK_FOR_GRAALVM", "--dy", "/graal-js", "build"],
["set-export", "JAVA_HOME", ["mx", "-p", "../vm", "--java-home", "$JDK_FOR_GRAALVM", "--dy", "/graal-js", "graalvm-home"]],
["cd", "public_maven"],
["cd", "external_repos/"],
["python", "populate.py"],
["cd", "simpletool"],
["mvn", "package"],
Expand All @@ -66,7 +66,7 @@ simpleLanguageMavenProjectGate: {
["mx", "maven-deploy", "--all-suites", "--version-string", ["mx", "-p", "../vm", "graalvm-version"]],
["mx", "-p", "../vm", "--java-home", "$JDK_FOR_GRAALVM", "--dy", "/substratevm", "--native-images=none", "build"],
["set-export", "JAVA_HOME", ["mx", "-p", "../vm", "--java-home", "$JDK_FOR_GRAALVM", "--dy", "/substratevm", "--native-images=none", "graalvm-home"]],
["cd", "public_maven"],
["cd", "external_repos"],
["python", "populate.py"],
["cd", "simplelanguage"],
["mvn", "package"],
Expand All @@ -85,10 +85,10 @@ builds += [
${linux-amd64} ${oraclejdk8} ${truffleCommon} {run : [["mx", "build"], ["mx", "sigtest", "--check", "all"]], targets : [gate], name: "gate-truffle-sigtest"},
${linux-amd64} ${oraclejdk11} ${truffleCommon} {run : [["mx", "build"], ["mx", "sigtest", "--check", "bin"]], targets : [gate], name: "gate-truffle-sigtest-11"},

${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleToolMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$JAVA_HOME"}, name: "gate-public-mvn-simpletool-8"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleToolMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$EXTRA_JAVA_HOMES"}, name: "gate-public-mvn-simpletool-11"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleLanguageMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$JAVA_HOME"}, name: "gate-public-mvn-simplelanguage-8"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleLanguageMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$EXTRA_JAVA_HOMES"}, name: "gate-public-mvn-simplelanguage-11"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleToolMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$JAVA_HOME"}, name: "gate-external-mvn-simpletool-8"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleToolMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$EXTRA_JAVA_HOMES"}, name: "gate-external-mvn-simpletool-11"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleLanguageMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$JAVA_HOME"}, name: "gate-external-mvn-simplelanguage-8"},
${linux-amd64} ${oraclejdk8} ${truffleCommon} ${simpleLanguageMavenProjectGate} {environment: {JDK_FOR_GRAALVM: "$EXTRA_JAVA_HOMES"}, name: "gate-external-mvn-simplelanguage-11"},

${linux-amd64} ${oraclejdk8} ${truffleCommon} ${eclipse} ${jdt} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-8"},
${linux-amd64} ${oraclejdk11} ${truffleCommon} ${eclipse} {run : [["mx", "--strict-compliance", "gate", "--strict-mode"]], targets : [gate], name: "gate-truffle-oraclejdk-11"},
Expand Down

0 comments on commit f89d036

Please sign in to comment.