diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2019-11-21 13:57:40 +0100 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-04-10 09:09:58 -0400 |
| commit | 38eb369fa4d06e55869a8fae62796a7b0085a5bd (patch) | |
| tree | a2f010105a6087ba68ff8ca3bf9371633463739d /src/ci/docker/x86_64-gnu-tools | |
| parent | 42abbd8878d3b67238f3611b0587c704ba94f39c (diff) | |
| download | rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.tar.gz rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.zip | |
Enforce Python 3 as much as possible
Diffstat (limited to 'src/ci/docker/x86_64-gnu-tools')
| -rw-r--r-- | src/ci/docker/x86_64-gnu-tools/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/x86_64-gnu-tools/checktools.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/x86_64-gnu-tools/Dockerfile b/src/ci/docker/x86_64-gnu-tools/Dockerfile index 51193402ee8..148e09f6ad1 100644 --- a/src/ci/docker/x86_64-gnu-tools/Dockerfile +++ b/src/ci/docker/x86_64-gnu-tools/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ file \ curl \ ca-certificates \ - python2.7 \ + python3 \ git \ cmake \ libssl-dev \ diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index 72325c7b948..00ac20c08dc 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -7,7 +7,7 @@ X_PY="$1" # Try to test all the tools and store the build/test success in the TOOLSTATE_FILE set +e -python2.7 "$X_PY" test --no-fail-fast \ +python3 "$X_PY" test --no-fail-fast \ src/doc/book \ src/doc/nomicon \ src/doc/reference \ @@ -22,4 +22,4 @@ python2.7 "$X_PY" test --no-fail-fast \ set -e -python2.7 "$X_PY" test check-tools +python3 "$X_PY" test check-tools |