Skip to content

Commit

Permalink
Update travis.yml
Browse files Browse the repository at this point in the history
Remove obsolete test-suite config from test-run.py
  • Loading branch information
bigbes committed Dec 12, 2018
1 parent d90237b commit ef47438
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 58 deletions.
14 changes: 14 additions & 0 deletions .travis.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.PHONY: test

all: package

package:
git clone https://github.com/packpack/packpack.git packpack
packpack/packpack

test:
curl -s https://packagecloud.io/install/repositories/tarantool/1_10/script.deb.sh | sudo bash
sudo apt install tarantool
phpize && ./configure && make all && sudo make install
sudo pip install PyYAML
./test-run.py
52 changes: 16 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ services:

language: php

php:
- 7.0
- 7.1
- nightly

python:
- 2.7

Expand All @@ -17,43 +12,28 @@ cache: false
env:
global:
- PRODUCT=php-tarantool
matrix:
- OS=el DIST=6 PACK=rpm
- OS=el DIST=7 PACK=rpm
- OS=fedora DIST=22 PACK=rpm
- OS=fedora DIST=23 PACK=rpm
- OS=fedora DIST=rawhide PACK=rpm
- OS=ubuntu DIST=trusty PACK=deb
- OS=ubuntu DIST=precise PACK=deb
- OS=ubuntu DIST=wily PACK=deb
# phpize is, currently, broken on xenial. can't test, still not stable
# - OS=ubuntu DIST=xenial PACK=deb
- OS=debian DIST=jessie PACK=deb
- OS=debian DIST=wheezy PACK=deb
- OS=debian DIST=stretch PACK=deb
- OS=debian DIST=sid PACK=deb
- PACK=none

# multiple php version exclusion matrix
matrix:
include:
- { env: TARGET=test, php: 7.1 }
- { env: TARGET=test, php: 7.2 }
fast_finish: true
allow_failures:
- env: OS=el DIST=6 PACK=rpm
- env: OS=el DIST=7 PACK=rpm
- env: OS=fedora DIST=22 PACK=rpm
- env: OS=fedora DIST=23 PACK=rpm
- env: OS=fedora DIST=rawhide PACK=rpm
- env: OS=ubuntu DIST=precise PACK=deb
- env: OS=ubuntu DIST=trusty PACK=deb
- env: OS=ubuntu DIST=wily PACK=deb
- env: OS=debian DIST=jessie PACK=deb
- env: OS=debian DIST=wheezy PACK=deb
- env: OS=debian DIST=stretch PACK=deb
- env: OS=debian DIST=sid PACK=deb
allowed_failures:
- OS=el DIST=6
- OS=el DIST=7
- OS=fedora DIST=26
- OS=fedora DIST=27
- OS=ubuntu DIST=trusty
- OS=ubuntu DIST=xenial
- OS=ubuntu DIST=artful
- OS=ubuntu DIST=bionic
- OS=debian DIST=wheezy
- OS=debian DIST=jessie
- OS=debian DIST=stretch

script:
- git clone https://github.com/packpack/packpack.git packpack
- packpack/packpack;
- make -f .travis.mk ${TARGET}

notifications:
email: true
Expand Down
2 changes: 1 addition & 1 deletion lib/tarantool_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def start(self):
self.generate_configuration()
if self.script:
shutil.copy(self.script, self.script_dst)
os.chmod(self.script_dst, 511)
os.chmod(self.script_dst, 0o777)
args = self.prepare_args()
self.process = subprocess.Popen(args,
cwd = self.vardir,
Expand Down
3 changes: 1 addition & 2 deletions test-run.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ def main():

for php_ini in [
'test/shared/tarantool-1.ini',
'test/shared/tarantool-2.ini',
'test/shared/tarantool-3.ini'
'test/shared/tarantool-2.ini'
]:
cmd = ''
shutil.copy(php_ini, os.path.join(test_cwd, 'tarantool.ini'))
Expand Down
19 changes: 0 additions & 19 deletions test.sh

This file was deleted.

0 comments on commit ef47438

Please sign in to comment.