From 23af6f7f52052f86c194343237919db6880971b4 Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 26 Oct 2017 23:08:36 +1300 Subject: [PATCH 1/2] Use phpenv for the php build in travis instead of a PPA --- .travis.yml | 3 --- tools/travis/build_tools.sh | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b353761b2d..3095262290 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/tools/travis/build_tools.sh b/tools/travis/build_tools.sh index 2e9810b470..b3409209af 100755 --- a/tools/travis/build_tools.sh +++ b/tools/travis/build_tools.sh @@ -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; From df370b069293ab3f974f4b23e52984386f881450 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 15:32:00 -0500 Subject: [PATCH 2/2] Update build_tools.sh --- tools/travis/build_tools.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/travis/build_tools.sh b/tools/travis/build_tools.sh index b3409209af..193ad261a6 100755 --- a/tools/travis/build_tools.sh +++ b/tools/travis/build_tools.sh @@ -7,12 +7,8 @@ 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;