Skip to content

Commit ef47438

Browse files
committed
Update travis.yml
Remove obsolete test-suite config from test-run.py
1 parent d90237b commit ef47438

File tree

5 files changed

+32
-58
lines changed

5 files changed

+32
-58
lines changed

.travis.mk

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.PHONY: test
2+
3+
all: package
4+
5+
package:
6+
git clone https://github.com/packpack/packpack.git packpack
7+
packpack/packpack
8+
9+
test:
10+
curl -s https://packagecloud.io/install/repositories/tarantool/1_10/script.deb.sh | sudo bash
11+
sudo apt install tarantool
12+
phpize && ./configure && make all && sudo make install
13+
sudo pip install PyYAML
14+
./test-run.py

.travis.yml

+16-36
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ services:
44

55
language: php
66

7-
php:
8-
- 7.0
9-
- 7.1
10-
- nightly
11-
127
python:
138
- 2.7
149

@@ -17,43 +12,28 @@ cache: false
1712
env:
1813
global:
1914
- PRODUCT=php-tarantool
20-
matrix:
21-
- OS=el DIST=6 PACK=rpm
22-
- OS=el DIST=7 PACK=rpm
23-
- OS=fedora DIST=22 PACK=rpm
24-
- OS=fedora DIST=23 PACK=rpm
25-
- OS=fedora DIST=rawhide PACK=rpm
26-
- OS=ubuntu DIST=trusty PACK=deb
27-
- OS=ubuntu DIST=precise PACK=deb
28-
- OS=ubuntu DIST=wily PACK=deb
29-
# phpize is, currently, broken on xenial. can't test, still not stable
30-
# - OS=ubuntu DIST=xenial PACK=deb
31-
- OS=debian DIST=jessie PACK=deb
32-
- OS=debian DIST=wheezy PACK=deb
33-
- OS=debian DIST=stretch PACK=deb
34-
- OS=debian DIST=sid PACK=deb
35-
- PACK=none
3615

3716
# multiple php version exclusion matrix
3817
matrix:
18+
include:
19+
- { env: TARGET=test, php: 7.1 }
20+
- { env: TARGET=test, php: 7.2 }
3921
fast_finish: true
40-
allow_failures:
41-
- env: OS=el DIST=6 PACK=rpm
42-
- env: OS=el DIST=7 PACK=rpm
43-
- env: OS=fedora DIST=22 PACK=rpm
44-
- env: OS=fedora DIST=23 PACK=rpm
45-
- env: OS=fedora DIST=rawhide PACK=rpm
46-
- env: OS=ubuntu DIST=precise PACK=deb
47-
- env: OS=ubuntu DIST=trusty PACK=deb
48-
- env: OS=ubuntu DIST=wily PACK=deb
49-
- env: OS=debian DIST=jessie PACK=deb
50-
- env: OS=debian DIST=wheezy PACK=deb
51-
- env: OS=debian DIST=stretch PACK=deb
52-
- env: OS=debian DIST=sid PACK=deb
22+
allowed_failures:
23+
- OS=el DIST=6
24+
- OS=el DIST=7
25+
- OS=fedora DIST=26
26+
- OS=fedora DIST=27
27+
- OS=ubuntu DIST=trusty
28+
- OS=ubuntu DIST=xenial
29+
- OS=ubuntu DIST=artful
30+
- OS=ubuntu DIST=bionic
31+
- OS=debian DIST=wheezy
32+
- OS=debian DIST=jessie
33+
- OS=debian DIST=stretch
5334

5435
script:
55-
- git clone https://github.com/packpack/packpack.git packpack
56-
- packpack/packpack;
36+
- make -f .travis.mk ${TARGET}
5737

5838
notifications:
5939
email: true

lib/tarantool_server.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def start(self):
245245
self.generate_configuration()
246246
if self.script:
247247
shutil.copy(self.script, self.script_dst)
248-
os.chmod(self.script_dst, 511)
248+
os.chmod(self.script_dst, 0o777)
249249
args = self.prepare_args()
250250
self.process = subprocess.Popen(args,
251251
cwd = self.vardir,

test-run.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@ def main():
7272

7373
for php_ini in [
7474
'test/shared/tarantool-1.ini',
75-
'test/shared/tarantool-2.ini',
76-
'test/shared/tarantool-3.ini'
75+
'test/shared/tarantool-2.ini'
7776
]:
7877
cmd = ''
7978
shutil.copy(php_ini, os.path.join(test_cwd, 'tarantool.ini'))

test.sh

-19
This file was deleted.

0 commit comments

Comments
 (0)