Mirrors
/
atom-beautify
mirror of https://github.com/Glavin001/atom-beautify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1995 from szeck87/travis-appveyor-fixes 

Use pip2 for OSX, php 7.2 for Windows
This commit is contained in:
Steven Zeck 2018-01-04 19:21:23 -06:00 committed by GitHub
parent 8de12b9777 a60ba02a7a
commit c2bcd5091f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -113,15 +113,15 @@ before_install:
pip install --user --upgrade autopep8; pip install --user --upgrade autopep8;
pip install --user --upgrade isort; pip install --user --upgrade isort;
else else
pip install --upgrade pip; pip2 install --upgrade pip2;
pip install --upgrade autopep8; pip2 install --upgrade autopep8;
pip install --upgrade isort; pip2 install --upgrade isort;
fi fi
# SQL language support # SQL language support
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pip install --user --upgrade sqlparse; pip install --user --upgrade sqlparse;
else else
pip install --upgrade sqlparse; pip2 install --upgrade sqlparse;
fi fi
# Java, C, C++, C#, Objective-C, D, Pawn, Vala # Java, C, C++, C#, Objective-C, D, Pawn, Vala
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
@ -184,7 +184,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
pip install --user beautysh; pip install --user beautysh;
else else
pip install beautysh; pip2 install beautysh;
fi fi
# terraform # terraform
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then

4
appveyor.yml
View File

@ -107,8 +107,8 @@ install:
# PHP # PHP
- ps: Set-Service wuauserv -StartupType Manual - ps: Set-Service wuauserv -StartupType Manual
- cinst php -y - cinst php -y
- ps: "ls \"C:\\tools\\php71\"" - ps: "ls \"C:\\tools\\php72\""
- "SET PATH=C:\\tools\\php71;%PATH%" - "SET PATH=C:\\tools\\php72;%PATH%"
- where php - where php
# PHP-CS-Fixer # PHP-CS-Fixer
- cinst curl -y # Use cURL to download file from URL - cinst curl -y # Use cURL to download file from URL