From 30f6b5fadf23bce586ade69bb701cb10a4a4e291 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sun, 24 Sep 2017 15:45:24 +0200
Subject: core: add a workaround for Python 3 issue on Travis CI

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 52677d1d8..a38cef2d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,18 @@ sudo: required
 dist: trusty
 
 env:
-    - BUILDTOOL="cmake" BUILDARGS=""
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON"
-    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF"
-    - BUILDTOOL="autotools" BUILDARGS=""
-    - BUILDTOOL="autotools" BUILDARGS="--enable-python3"
-    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls"
+    - BUILDTOOL="cmake" BUILDARGS="" PY_VER=2.7
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_PYTHON3=ON" PY_VER=3.6
+    - BUILDTOOL="cmake" BUILDARGS="-DENABLE_GNUTLS=OFF" PY_VER=2.7
+    - BUILDTOOL="autotools" BUILDARGS="" PY_VER=2.7
+    - BUILDTOOL="autotools" BUILDARGS="--enable-python3" PY_VER=3.6
+    - BUILDTOOL="autotools" BUILDARGS="--disable-gnutls" PY_VER=2.7
 
 before_script:
-    # Workaround travis-ci/travis-ci#5326
+    # Workaround https://github.com/travis-ci/travis-ci/issues/5326
     - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
+    # Workaround https://github.com/travis-ci/travis-ci/issues/8363
+    - pyenv global system ${PY_VER}
     - echo 'APT::Install-Recommends "false";' | sudo tee -a /etc/apt/apt.conf
     - sudo add-apt-repository -y ppa:ondrej/php
     - sudo apt-get update -qq
-- 
cgit v1.2.3