mirror of
https://github.com/phpseclib/phpseclib.git
synced 2024-12-27 03:42:40 +00:00
Merge branch 'travis-fix-1.0' into 2.0
Conflicts: .travis.yml
This commit is contained in:
commit
8eb581a430
@ -8,7 +8,6 @@ php:
|
|||||||
- 5.5
|
- 5.5
|
||||||
- 5.6
|
- 5.6
|
||||||
- 7.0
|
- 7.0
|
||||||
- hhvm
|
|
||||||
|
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
@ -19,7 +18,13 @@ env:
|
|||||||
before_install: true
|
before_install: true
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- sudo apt-get install parallel
|
- wget http://ftp.gnu.org/gnu/parallel/parallel-20120522.tar.bz2
|
||||||
|
- tar -xvjf parallel*
|
||||||
|
- cd parallel*
|
||||||
|
- ./configure
|
||||||
|
- make
|
||||||
|
- sudo make install
|
||||||
|
- cd ..
|
||||||
- eval `ssh-agent -s`
|
- eval `ssh-agent -s`
|
||||||
- travis/setup-secure-shell.sh
|
- travis/setup-secure-shell.sh
|
||||||
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a '$TRAVIS_PHP_VERSION' != '7.0' ]; then travis/install-php-extensions.sh; fi"
|
- sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' -a '$TRAVIS_PHP_VERSION' != '7.0' ]; then travis/install-php-extensions.sh; fi"
|
||||||
|
Loading…
Reference in New Issue
Block a user