From d80cf54e10cc0b2e76e86d7b23a2bcc35cd5fe06 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 17 Nov 2021 21:13:01 +0100 Subject: [PATCH] Declare all jobs as Python This way we get our chosen Python version everywhere, and pip is available. Travis doesn't support the python job type on Windows, however, so keep installing Python manually there. Signed-off-by: Gilles Peskine --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f910ace98..08d7dfb70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ -language: c -compiler: gcc +# Declare python as our language. This way we get our chosen Python version, +# and pip is available. Gcc and clang are available anyway. +language: python +python: 3.5 sudo: false cache: ccache @@ -16,8 +18,6 @@ jobs: - libnewlib-arm-none-eabi - gcc-arm-linux-gnueabi - libc6-dev-armel-cross - language: python # Needed to get pip for Python 3 - python: 3.5 # version from Ubuntu 16.04 script: - tests/scripts/all.sh -k 'check_*' - tests/scripts/all.sh -k test_default_out_of_box @@ -30,6 +30,10 @@ jobs: - name: Windows os: windows + # The language 'python' is currently unsupported on the + # Windows Build Environment. And 'generic' causes the job to get stuck + # on "Booting virtual machine". + language: c before_install: - choco install python --version=3.5.4 env: