From a60ba02a7a1c4a36dbd60fcf68cf8e93a7e17fdb Mon Sep 17 00:00:00 2001 From: Steven Zeck Date: Tue, 2 Jan 2018 23:32:49 -0600 Subject: [PATCH] Use pip2 for OSX, php 7.2 for Windows --- .travis.yml | 10 +++++----- appveyor.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b2e4ca..f12cc1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,15 +113,15 @@ before_install: pip install --user --upgrade autopep8; pip install --user --upgrade isort; else - pip install --upgrade pip; - pip install --upgrade autopep8; - pip install --upgrade isort; + pip2 install --upgrade pip2; + pip2 install --upgrade autopep8; + pip2 install --upgrade isort; fi # SQL language support - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user --upgrade sqlparse; else - pip install --upgrade sqlparse; + pip2 install --upgrade sqlparse; fi # Java, C, C++, C#, Objective-C, D, Pawn, Vala - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then @@ -184,7 +184,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pip install --user beautysh; else - pip install beautysh; + pip2 install beautysh; fi # terraform - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then diff --git a/appveyor.yml b/appveyor.yml index bf21dfb..e3fb5d8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -107,8 +107,8 @@ install: # PHP - ps: Set-Service wuauserv -StartupType Manual - cinst php -y - - ps: "ls \"C:\\tools\\php71\"" - - "SET PATH=C:\\tools\\php71;%PATH%" + - ps: "ls \"C:\\tools\\php72\"" + - "SET PATH=C:\\tools\\php72;%PATH%" - where php # PHP-CS-Fixer - cinst curl -y # Use cURL to download file from URL