diff options
author | Jack Lloyd <[email protected]> | 2018-10-12 18:52:36 -0400 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2018-10-12 18:52:36 -0400 |
commit | 9249da3c4e87bfbdbe88882e65ae01d1f90e31eb (patch) | |
tree | 8ad7bd73c71e23917a6ad28b8ed5908139443281 /src/scripts | |
parent | 0631dc89afa271f067633b2444e3408d340cb505 (diff) |
Only use Python3 in CI builds if requested explicitly
It looks like Travis has some old version of Python 3 which can't handle
interpolating an integer into a byte string -- expr b"wtf %d" % (5)
fails with whatever is on Travis, but works fine in Python 3.7
Diffstat (limited to 'src/scripts')
-rwxr-xr-x | src/scripts/ci_build.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index c74e4eba6..0c288a540 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -325,14 +325,16 @@ def main(args=None): target = args[1] + py_interp = 'python' + use_python2 = have_prog('python2') if options.use_python3 is None: use_python3 = have_prog('python3') else: use_python3 = options.use_python3 - - py_interp = 'python3' if use_python3 else 'python' + if use_python3: + py_interp = 'python3' if options.cc_bin is None: if options.cc == 'gcc': |