From a59eedade1b648403f79b4efe99bf547ae624be5 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Fri, 17 Apr 2020 23:54:16 +0100 Subject: [PATCH] travis: Ensure python version is >= 3.5 --- .travis.yml | 6 ++---- .travis/sse3-only-on-x86_64-linux/deps.sh | 4 +++- .travis/test-with-unicorn-on-x86_64-linux/deps.sh | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b86c9f50..c88d7253 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,8 +38,7 @@ matrix: script: ./.travis/build-x86_64-macos/build.sh - env: NAME="Test - Fuzz against Unicorn" os: linux - dist: trusty - python: "3.8" + dist: bionic addons: apt: sources: @@ -53,8 +52,7 @@ matrix: script: ./.travis/test-with-unicorn-on-x86_64-linux/build.sh - env: NAME="Test - SSE3 only" os: linux - dist: trusty - python: "3.8" + dist: bionic addons: apt: sources: diff --git a/.travis/sse3-only-on-x86_64-linux/deps.sh b/.travis/sse3-only-on-x86_64-linux/deps.sh index 1906f63e..b14c3443 100755 --- a/.travis/sse3-only-on-x86_64-linux/deps.sh +++ b/.travis/sse3-only-on-x86_64-linux/deps.sh @@ -3,10 +3,12 @@ set -e set -x +python3 --version + # TODO: This isn't ideal. cd externals git clone https://github.com/MerryMage/ext-boost -git clone https://github.com/yuzu-emu/unicorn +git clone https://github.com/MerryMage/unicorn cd unicorn UNICORN_ARCHS=aarch64,arm ./make.sh cd ../.. diff --git a/.travis/test-with-unicorn-on-x86_64-linux/deps.sh b/.travis/test-with-unicorn-on-x86_64-linux/deps.sh index 10f98b4d..cfa8575e 100755 --- a/.travis/test-with-unicorn-on-x86_64-linux/deps.sh +++ b/.travis/test-with-unicorn-on-x86_64-linux/deps.sh @@ -3,10 +3,12 @@ set -e set -x +python3 --version + # TODO: This isn't ideal. cd externals git clone https://github.com/MerryMage/ext-boost -git clone https://github.com/yuzu-emu/unicorn +git clone https://github.com/MerryMage/unicorn cd unicorn UNICORN_ARCHS="arm aarch64" ./make.sh cd ../..