Merge pull request #3627 from Citadel-Station-13/upstream-merge-32050

[MIRROR] Use phpenv for the php build in travis instead of a PPA
This commit is contained in:
LetterJay
2017-10-28 03:16:26 -04:00
committed by GitHub
2 changed files with 3 additions and 4 deletions
-3
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
+3 -1
View File
@@ -7,6 +7,8 @@ if [ "$BUILD_TOOLS" = true ];
then
md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml";
cd tgui && source ~/.nvm/nvm.sh && gulp && cd ..;
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;
python tools/ss13_genchangelog.py html/changelog.html html/changelogs;
fi;