Skip to content

Commit 05e316c

Browse files
[GR-53358] Fix mx revision.
PullRequest: labsjdk-ce-22/18
2 parents a390a1e + e8a00da commit 05e316c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

ci.jsonnet

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,6 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
257257
run+: [
258258
["git", "clone", defs.graal_enterprise_url],
259259

260-
# Reset mx to the version expected by Graal
261-
["git", "-C", "$MX_HOME", "reset", "--hard", ["python3", "-c", "import json; print(json.load(open('" + self.path("graal-enterprise/common.json") + "'))['mx_version'])"]],
262-
263260
# This puts cygwin on the PATH so that `test` and `cat` are available
264261
["set-export", "OLD_PATH", "${PATH}"],
265262
["set-export", "PATH", "${JIB_PATH}"],
@@ -269,6 +266,10 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
269266
["git", "-C", "graal-enterprise", "checkout", ["cat", "graal-enterprise.commit"]],
270267
["git", "-C", "graal-enterprise", "rev-list", "-n", "1", "HEAD", ">graal-enterprise.commit"],
271268

269+
# Reset mx to the version expected by Graal
270+
["git", "-C", "$MX_HOME", "reset", "--hard", ["python3", "-c", "import json; print(json.load(open('" + self.path("graal-enterprise/common.json") + "'))['mx_version'])"]],
271+
272+
272273
# Restore PATH as cygwin must not be on the PATH when building Graal.
273274
["set-export", "PATH", "${OLD_PATH}"],
274275

0 commit comments

Comments
 (0)