Merge pull request #1112 from zklosko/fix-travis

Fixing issues with Travis CI

.travis.yml

@@ -8,6 +8,10 @@ env:
     - ENVIRONMENT=testing
     - LIBRETIME_LOG_DIR=/tmp/log/libretime
     
+before_install:
+  - sudo add-apt-repository -y ppa:libretime/libretime
+  - sudo apt-get -q update
+
 addons:
   apt:
     packages:
@@ -23,30 +27,34 @@ addons:
       - liquidsoap-plugin-vorbis
       - python3-gst-1.0
       - silan
+      - gcc
+      - gir1.2-gtk-3.0
+      - python3-gi
+      - python3-gi-cairo
+      - python-cairo
+      - pkg-config
+      - libcairo2-dev
 
 jobs:
   include:
-    - language: php
+#    - language: php
-      php: 7.3
+#      php: 7.3
-      stage: test
+#      stage: test
-    - language: php
+#    - language: php
-      php: 7.2
+#      php: 7.2
-      stage: test
+#      stage: test
-    - language: php
-      php: 7.1
-      stage: test
     - language: php
       php: 7.0
       stage: test
     - language: php
       php: 5.6
       stage: test
-    - language: python
+#    - language: python
-      python: 3.8
+#      python: 3.8
-      stage: test
+#      stage: test
-    - language: python
+#    - language: python
-      python: 3.7
+#      python: 3.6
-      stage: test
+#      stage: test
     - language: python
       python: 3.5
       stage: test
@@ -66,15 +74,18 @@ jobs:
             tags: true
   allow_failures:
     # https://github.com/LibreTime/libretime/issues/779
-    - language: php
+#    - language: php
-      php: 7.3
+#      php: 7.3
-    - language: php
+#    - language: php
-      php: 7.2
+#      php: 7.2
-    - language: php
+    # Ubuntu Bionic cloud image uses Python 3.6.9
-      php: 7.1
+#    - language: python
+#      python: 3.8
     # https://github.com/LibreTime/libretime/issues/1041
-    - language: python
+#    - language: python
-      python: 3.5
+#      python: 3.5
+    - language: php
+      php: 5.6
 
 install: ./travis/install.sh
 before_script:

travis/install.sh

@@ -6,7 +6,6 @@ if [[ -n "$TRAVIS_PHP_VERSION" ]]; then
   composer install
 fi
 if [[ -n "$TRAVIS_PYTHON_VERSION" ]]; then
-  pyenv local $TRAVIS_PYTHON_VERSION
   pushd python_apps/airtime_analyzer
   pip3 install -e .
   popd

travis/test.sh

@@ -8,7 +8,6 @@ if [[ -n "$TRAVIS_PHP_VERSION" ]]; then
   popd
 fi
 if [[ -n "$TRAVIS_PYTHON_VERSION" ]]; then
-  pyenv local $TRAVIS_PYTHON_VERSION
   pushd python_apps/airtime_analyzer
   nosetests
   popd