[GR-41931] Use guard less aggressively.

PullRequest: graal/12972
Karm · Oct 19, 2022 · 9910d5c · 9910d5c
2 parents 9a6bb97 + ac0fd5c
commit 9910d5c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet
@@ -15,6 +15,9 @@
     ],
     targets: ["gate"],
     timelimit: "30:00",
+  },
+
+  local guard = {
     guard: {
         includes: ["<graal>/sdk/**", "<graal>/truffle/**", "**.jsonnet"],
     }
@@ -108,24 +111,24 @@
 
   builds: std.flattenArrays([
       [
-        linux_amd64  + jdk + sigtest,
+        linux_amd64  + jdk + sigtest + guard,
         linux_amd64  + jdk + simple_tool_maven_project_gate + common.mach5_target,
         linux_amd64  + jdk + simple_language_maven_project_gate,
-        darwin_amd64 + jdk + truffle_weekly + gate_lite,
+        darwin_amd64 + jdk + truffle_weekly + gate_lite + guard,
       ] for jdk in [common.oraclejdk11, common.oraclejdk17]
     ]) + [
-    linux_amd64 + common.oraclejdk11 + truffle_gate + {timelimit: "45:00"},
-    linux_amd64 + common.oraclejdk17 + truffle_gate + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}},
+    linux_amd64 + common.oraclejdk11 + truffle_gate + guard + {timelimit: "45:00"},
+    linux_amd64 + common.oraclejdk17 + truffle_gate + guard + {environment+: {DISABLE_DSL_STATE_BITS_TESTS: "true"}},
 
-    truffle_common + linux_amd64 + common.oraclejdk11 {
+    truffle_common + linux_amd64 + common.oraclejdk11 + guard {
       name: "gate-truffle-javadoc",
       run: [
         ["mx", "build"],
         ["mx", "javadoc"],
       ],
     },
 
-    truffle_common + linux_amd64 + common.oraclejdk11 {
+    truffle_common + linux_amd64 + common.oraclejdk11 + guard {
       name: "gate-truffle-slow-path-unittests",
       run: [
         ["mx", "build", "-n", "-c", "-A-Atruffle.dsl.GenerateSlowPathOnly=true"],
@@ -136,7 +139,7 @@
       ],
     },
 
-    truffle_common + windows_amd64 + common.oraclejdk11 + devkits["windows-jdk11"] +{
+    truffle_common + windows_amd64 + common.oraclejdk11 + devkits["windows-jdk11"] + guard {
       name: "gate-truffle-nfi-windows-11",
       # TODO make that a full gate run
       # currently, some truffle unittests fail on windows
@@ -146,7 +149,7 @@
       ],
     },
 
-    truffle_common + linux_amd64 + common.oraclejdk11 + common.eclipse + common.jdt + {
+    truffle_common + linux_amd64 + common.oraclejdk11 + common.eclipse + common.jdt + guard + {
       name: "weekly-truffle-coverage-11-linux-amd64",
       run: [
         ["mx", "--strict-compliance", "gate", "--strict-mode", "--jacoco-relativize-paths", "--jacoco-omit-src-gen", "--jacocout", "coverage", "--jacoco-format", "lcov"],

diff --git a/truffle/external_repos/simplelanguage/launcher/pom.xml b/truffle/external_repos/simplelanguage/launcher/pom.xml
@@ -86,7 +86,7 @@
                   <exclude>com.oracle.truffle:truffle-api</exclude>
                   <exclude>com.oracle.truffle:truffle-dsl-processor</exclude>
                   <exclude>com.oracle.truffle:truffle-tck</exclude>
-                  <exclude>org.graalvm:graal-sdk</exclude>
+                  <exclude>org.graalvm.sdk:graal-sdk</exclude>
                 </excludes>
               </artifactSet>
             </configuration>