Use phpenv for the php build in travis instead of a PPA

This commit is contained in:
oranges
2017-10-26 23:08:36 +13:00
committed by CitadelStationBot
parent 630b332848
commit 23af6f7f52
2 changed files with 6 additions and 3 deletions

View File

@@ -21,15 +21,12 @@ cache:
addons:
apt:
sources:
- sourceline: 'ppa:ondrej/php'
packages:
- libc6-i386
- libgcc1:i386
- libstdc++6:i386
- python
- python-pip
- php5.6
install:
- tools/travis/install_build_tools.sh

View File

@@ -7,6 +7,12 @@ if [ "$BUILD_TOOLS" = true ];
then
md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml";
cd tgui && source ~/.nvm/nvm.sh && gulp && cd ..;
<<<<<<< HEAD
php5.6 -l tools/WebhookProcessor/github_webhook_processor.php;
=======
phpenv global 5.6
php -l tools/WebhookProcessor/github_webhook_processor.php;
php -l tools/TGUICompiler.php;
>>>>>>> 9b71dcb... Merge pull request #32050 from optimumtact/ripandtearthehugeguts
python tools/ss13_genchangelog.py html/changelog.html html/changelogs;
fi;