Quick fix

guizmaii · Oct 9, 2022 · 2677a35 · 2677a35
1 parent 96c625b
commit 2677a35
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/graal-common.json b/graal-common.json
@@ -1,6 +1,6 @@
 {
   "README": "This file contains definitions that are useful for the jsonnet CI files of the graal and graal-enterprise repositories.",
   "ci": {
-    "overlay": "7fe3eba6396a9b4babac6171e7d2fb95da4dc65c"
+    "overlay": "bbb85d82fa029b016b8f4007de65204d38c6e6e1"
   },
 }
diff --git a/java-benchmarks/mx.java-benchmarks/suite.py b/java-benchmarks/mx.java-benchmarks/suite.py
@@ -1,5 +1,5 @@
 suite = {
-  "mxversion" : "6.4.0",
+  "mxversion" : "6.8.0",
   "name": "java-benchmarks",
 
   "ignore_suite_commit_info": True,

diff --git a/sulong/ci/ci_common/sulong-common.jsonnet b/sulong/ci/ci_common/sulong-common.jsonnet
@@ -1,15 +1,8 @@
 # File is formatted with
 # `jsonnetfmt --indent 2 --max-blank-lines 2 --sort-imports --string-style d --comment-style h -i ci.jsonnet`
-<<<<<<< HEAD:sulong/ci_common/sulong-common.jsonnet
-local common = import "../../common.jsonnet";
-local composable = (import "../../common-utils.libsonnet").composable;
-local sulong_deps = composable((import "../../common.json").sulong.deps);
-=======
-{
-  local common = import "../../../common.jsonnet",
-  local composable = (import "../../../common-utils.libsonnet").composable,
-  local sulong_deps = composable((import "../../../common.json").sulong.deps),
->>>>>>> bf1a236d573 (Group ci files in each suite):sulong/ci/ci_common/sulong-common.jsonnet
+local common = import "../../../common.jsonnet";
+local composable = (import "../../../common-utils.libsonnet").composable;
+local sulong_deps = composable((import "../../../common.json").sulong.deps);
 
 {
   local linux_amd64 = common.linux_amd64,