Skip to content

Commit

Permalink
Fix branch build (#126)
Browse files Browse the repository at this point in the history
* Fix branch build

* New lines

* Use 3.30-lts-latest
  • Loading branch information
tyronjung-quizlet authored Feb 19, 2020
1 parent 2a52af7 commit 3c2bdc0
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 10 deletions.
25 changes: 20 additions & 5 deletions .travis.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
#!/bin/sh
set -ex
apt update -y
DEBIAN_FRONTEND=noninteractive apt install -y php-cli zip unzip
hhvm --version
php --version
if [ ! -e .git/refs/heads/master ]; then
# - Travis clones with `--branch`, then moves to a detached HEAD state
# - if we're on a detached HEAD, Composer uses master to resolve branch
# aliases.
# So, create the master branch :p
git branch master HEAD
fi

composer install
(
cd $(mktemp -d)
curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
)
if (hhvm --version | grep -q -- -dev); then
# Doesn't exist in master, but keep it here so that we can test release
# branches on nightlies too
rm -f composer.lock
fi
hhvm /usr/local/bin/composer install

hh_client

vendor/bin/hacktest tests/

echo > .hhconfig
hh_server --check $(pwd)
15 changes: 10 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
language: php
php:
- hhvm-3.30

sudo: required
language: generic
services: docker
env:
- HHVM_VERSION=3.30-lts-latest
install:
- docker pull hhvm/hhvm:$HHVM_VERSION
script:
- ./.travis.sh
- docker run --rm -w /var/source -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION ./.travis.sh
notifications:
webhooks: https://code.facebook.com/travis/webhook/
slack:
secure: LH2n9tQoW3/OUO/ppXLnGIVAbYtl07avQne/gkcal/csGc18BSly15/bNZvGTlC65aac+yjbGHlcWuBm8Qyl5l2oWZADqoRN7+HeOYw1qSx2eRA5BzVcdKd9eHjl5xobxLC2NXZL/NSiN+Ku/YDuzzkwpGqIcC4EiwvFsab6B2rigdazFaNRceAxnyYwNs3VdzFj9vBDqbfUDFV7lgjZJxbKos26O/Z4F58a2tsV2hbT+tF8W3hfPrMaYuxWVv2+Irc0uGoNc5EG+2eRT5AzMtp6YKzQ5LzEkC/lNwojUg/dr9xV+3vZu+IARy7HsBuX5KZo3IBGHL18q8srgEM4NBQy8IUmVAlGGw7vw1cInIoqUTOvHBqVvDAs2RNr5f7u+2Li0Sw9vuGhoeNtLVvTjZ9r5XmEzdEx9pUFrsO16YdJLnpiYiyWlWAeAkDljXD/d5L/i0sZgaeY/eubYADJr/ZA+M78aiLuw5eEWqu5s9a4xhrGEBkUHyPRpXU1AxVAPr1L6/PK47QKYu1h45QfMQL8TmrNw9VPLUIm5P4k3RFz9CC5C35u5HfFTubErcDl1CZUSoGUuW4foTbkWSJGlgvQquS824mL2VIO5Ut6J6+/2iqsK/HfKOiToDpiiwpe2KoQsyy5QHVWMVNTuKPou1yYH+6Z3DIx8/wEAkvCA+U=

0 comments on commit 3c2bdc0

Please sign in to comment.