Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 5c47ca4

Browse files
committed
Don't use docker on travis
1 parent 32f4234 commit 5c47ca4

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

.travis.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
#!/bin/sh
22
set -ex
33
hhvm --version
4-
echo hhvm.jit=0 >> /etc/hhvm/php.ini
5-
curl https://getcomposer.org/installer | hhvm --php -- /dev/stdin --install-dir=/usr/local/bin --filename=composer
64

7-
cd /var/source
8-
hhvm /usr/local/bin/composer install
5+
composer install
96

10-
hh_server --check $(pwd)
11-
hhvm -d hhvm.php7.all=0 vendor/bin/phpunit tests/
12-
hhvm -d hhvm.php7.all=1 vendor/bin/phpunit tests/
7+
hh_client
8+
hhvm vendor/bin/phpunit
9+
#hhvm vendor/bin/hhast-lint
1310

14-
sed -i '/enable_experimental_tc_features/d' .hhconfig
11+
# Make sure we pass when a release is required
12+
EXPORT_DIR=$(mktemp -d)
13+
git archive --format=tar -o "${EXPORT_DIR}/exported.tar" HEAD
14+
cd "$EXPORT_DIR"
15+
tar -xf exported.tar
16+
composer install --no-dev
17+
echo > .hhconfig
1518
hh_server --check $(pwd)

.travis.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
sudo: required
2-
language: generic
3-
services:
4-
- docker
5-
env:
6-
- HHVM_VERSION=latest
7-
- HHVM_VERSION=nightly
8-
install:
9-
- docker pull hhvm/hhvm:$HHVM_VERSION
1+
language: php
2+
php:
3+
- hhvm
4+
- hhvm-3.24
5+
- hhvm-nightly
106
script:
11-
- docker run -v $(pwd):/var/source hhvm/hhvm:$HHVM_VERSION /var/source/.travis.sh
7+
- ./.travis.sh

0 commit comments

Comments
 (0)