From 3089741f72f09b121422f41e940e8a9910bd44fe Mon Sep 17 00:00:00 2001 From: Gilles Duboscq Date: Mon, 5 Feb 2018 12:30:30 +0100 Subject: [PATCH] truffle_language_ensure: Explicitly resolve binary "branchref" --- substratevm/mx.substratevm/mx_substratevm.py | 10 ++-------- substratevm/mx.substratevm/suite.py | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py index 5b7febaf9bef..6433b0460182 100644 --- a/substratevm/mx.substratevm/mx_substratevm.py +++ b/substratevm/mx.substratevm/mx_substratevm.py @@ -363,15 +363,9 @@ def truffle_language_ensure(language_flag, version=None, native_image_root=None) if not version: # If no specific version requested use binary import of last recently deployed master version - version = 'git-bref:binary' repo_suite_name = language_repo_name if language_repo_name else language_suite_name - urlinfos.append( - mx.SuiteImportURLInfo( - mx_urlrewrites.rewriteurl('https://github.com/graalvm/{0}.git'.format(repo_suite_name)), - 'source', - mx.vc_system('git') - ) - ) + repo_url = mx_urlrewrites.rewriteurl('https://github.com/graalvm/{0}.git'.format(repo_suite_name)) + version = mx.SuiteImport.resolve_git_branchref(repo_url, 'binary', abortOnError=False) language_suite = suite.import_suite( language_suite_name, diff --git a/substratevm/mx.substratevm/suite.py b/substratevm/mx.substratevm/suite.py index 3c07cbcfb1ed..b13162f0a531 100644 --- a/substratevm/mx.substratevm/suite.py +++ b/substratevm/mx.substratevm/suite.py @@ -1,5 +1,5 @@ suite = { - "mxversion": "5.137.0", + "mxversion": "5.138.0", "name": "substratevm", "defaultLicense" : "GPLv2-CPE",