about summary refs log tree commit diff
path: root/src/ci/docker/scripts
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2019-11-21 13:57:40 +0100
committerMark Rousskov <mark.simulacrum@gmail.com>2020-04-10 09:09:58 -0400
commit38eb369fa4d06e55869a8fae62796a7b0085a5bd (patch)
treea2f010105a6087ba68ff8ca3bf9371633463739d /src/ci/docker/scripts
parent42abbd8878d3b67238f3611b0587c704ba94f39c (diff)
downloadrust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.tar.gz
rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.zip
Enforce Python 3 as much as possible
Diffstat (limited to 'src/ci/docker/scripts')
-rw-r--r--src/ci/docker/scripts/android-base-apt-get.sh2
-rw-r--r--src/ci/docker/scripts/android-ndk.sh2
-rw-r--r--src/ci/docker/scripts/cross-apt-packages.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ci/docker/scripts/android-base-apt-get.sh b/src/ci/docker/scripts/android-base-apt-get.sh
index 738410c58fc..391b68ea637 100644
--- a/src/ci/docker/scripts/android-base-apt-get.sh
+++ b/src/ci/docker/scripts/android-base-apt-get.sh
@@ -11,7 +11,7 @@ apt-get install -y --no-install-recommends \
   libssl-dev \
   make \
   pkg-config \
-  python2.7 \
+  python3 \
   sudo \
   unzip \
   xz-utils
diff --git a/src/ci/docker/scripts/android-ndk.sh b/src/ci/docker/scripts/android-ndk.sh
index 0db30e420e3..dafcb3cb7a7 100644
--- a/src/ci/docker/scripts/android-ndk.sh
+++ b/src/ci/docker/scripts/android-ndk.sh
@@ -13,7 +13,7 @@ download_ndk() {
 
 make_standalone_toolchain() {
     # See https://developer.android.com/ndk/guides/standalone_toolchain.htm
-    python2.7 /android/ndk/ndk/build/tools/make_standalone_toolchain.py \
+    python3 /android/ndk/ndk/build/tools/make_standalone_toolchain.py \
         --install-dir /android/ndk/$1-$2 \
         --arch $1 \
         --api $2
diff --git a/src/ci/docker/scripts/cross-apt-packages.sh b/src/ci/docker/scripts/cross-apt-packages.sh
index bb72e33def2..7030cd74cae 100644
--- a/src/ci/docker/scripts/cross-apt-packages.sh
+++ b/src/ci/docker/scripts/cross-apt-packages.sh
@@ -19,7 +19,7 @@ apt-get update && apt-get install -y --no-install-recommends \
   make \
   patch \
   pkg-config \
-  python2.7 \
+  python3 \
   sudo \
   texinfo \
   unzip \