Skip to content

Commit 64c9fca

Browse files
committed
Update travis-ci configuration
1 parent 70a4035 commit 64c9fca

File tree

2 files changed

+58
-18
lines changed

2 files changed

+58
-18
lines changed

.travis.yml

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,78 @@ language: ruby
22

33
os: linux
44

5-
dist: trusty
5+
dist: bionic
66
sudo: required
77

88
rvm:
99
- ruby-head
10-
- 2.5.0
11-
- 2.4.3
12-
- 2.3.5
10+
- 2.6
11+
- 2.5
12+
- 2.4
1313

1414
env:
1515
global:
1616
- PYCALL_DEBUG_FIND_LIBPYTHON=1
1717
matrix:
18-
- PYENV_VERSION=2.7.13
19-
- PYENV_VERSION=3.6.2
20-
- PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
21-
- PYENV_VERSION=miniconda2-4.1.11
22-
- PYENV_VERSION=miniconda3-4.3.11
18+
- PYENV_VERSION=3.8.0
19+
- PYENV_VERSION=3.7.5
20+
- PYENV_VERSION=2.7.17
21+
- PYENV_VERSION=system LIBPYTHON=/usr/lib/libpython3.6m.so
22+
- PYENV_VERSION=system LIBPYTHON=/usr/lib/libpython2.7.so
23+
- PYENV_VERSION=miniconda2-4.3.30
24+
- PYENV_VERSION=miniconda3-4.3.30
2325

2426
matrix:
2527
include:
2628
- os: osx
27-
osx_image: xcode9
29+
osx_image: xcode11.2
2830
compiler: clang
29-
rvm: 2.4.1
30-
env: PYENV_VERSION=3.6.2
31+
rvm: 2.6
32+
env: PYENV_VERSION=3.8.0
3133
- os: osx
32-
osx_image: xcode9
34+
osx_image: xcode11.2
3335
compiler: clang
34-
rvm: 2.4.1
36+
rvm: 2.5
37+
env: PYENV_VERSION=3.8.0
38+
- os: osx
39+
osx_image: xcode11.2
40+
compiler: clang
41+
rvm: 2.4
42+
env: PYENV_VERSION=3.8.0
43+
- os: osx
44+
osx_image: xcode11.2
45+
compiler: clang
46+
rvm: 2.6
47+
env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
48+
- os: osx
49+
osx_image: xcode11.2
50+
compiler: clang
51+
rvm: 2.5
52+
env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
53+
- os: osx
54+
osx_image: xcode11.2
55+
compiler: clang
56+
rvm: 2.4
3557
env: PYENV_VERSION=system LIBPYTHON=versions/3.6.2/lib/libpython3.6m.so
3658
- os: osx
37-
osx_image: xcode9
59+
osx_image: xcode11.2
60+
compiler: clang
61+
rvm: 2.6
62+
env: PYENV_VERSION=miniconda3-4.3.11
63+
- os: osx
64+
osx_image: xcode11.2
65+
compiler: clang
66+
rvm: 2.5
67+
env: PYENV_VERSION=miniconda3-4.3.11
68+
- os: osx
69+
osx_image: xcode11.2
3870
compiler: clang
39-
rvm: 2.4.1
71+
rvm: 2.4
4072
env: PYENV_VERSION=miniconda3-4.3.11
4173
allow_failures:
4274
- os: osx
4375

4476
before_install:
45-
- gem update --system
46-
- gem update bundler
4777
- export PATH="$(pyenv root)/bin:$PATH"
4878
- eval "$(pyenv init -)"
4979

ci/travis_install.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,21 @@ fi
1717
if test "$PYENV_VERSION" = "system"; then
1818
if test -z "$LIBPYTHON"; then
1919
echo "ERROR: LIBPYTHON is not provided for PYENV_VERSION=system" >2
20+
python3 lib/pycall/python/investigator.py
21+
python lib/pycall/python/investigator.py
2022
exit 1
2123
fi
2224
# NOTE: PYENV_VERSION should be the version of LIBPYTHON during install script
2325
PYENV_VERSION=$(basename $(dirname $(dirname $LIBPYTHON)))
2426
fi
27+
28+
(
29+
cd $(pyenv root)
30+
git fetch origin
31+
git checkout master
32+
git reset --hard origin/master
33+
)
34+
2535
PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install -f $PYENV_VERSION
2636

2737
case "$PYENV_VERSION" in

0 commit comments

Comments
 (0)