From bae3db83d81afa8d395286b607404402afa0e386 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Wed, 18 Nov 2020 21:01:07 +0200 Subject: [PATCH 01/13] empty commit to trigger travis --- temp | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 temp diff --git a/temp b/temp new file mode 100644 index 000000000..e69de29bb From 043c509e160f990f4f2ae8bb7e1650305c78f773 Mon Sep 17 00:00:00 2001 From: Kyle Robbertze Date: Wed, 18 Nov 2020 21:01:28 +0200 Subject: [PATCH 02/13] empty commit to trigger travis --- temp | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 temp diff --git a/temp b/temp deleted file mode 100644 index e69de29bb..000000000 From b5c88c28090f30f51dd8f15488ca908c609237a0 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 17:01:22 -0500 Subject: [PATCH 03/13] Removing PHP 7.1 @paddatrapper --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f041608d7..14640ada8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,9 +36,6 @@ jobs: - language: php php: 7.2 stage: test - - language: php - php: 7.1 - stage: test - language: php php: 7.0 stage: test @@ -74,8 +71,6 @@ jobs: php: 7.3 - language: php php: 7.2 - - language: php - php: 7.1 # https://github.com/LibreTime/libretime/issues/1041 - language: python python: 3.5 From 83a3977a9efd4045f33ca8d05b84d95137db347c Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Wed, 18 Nov 2020 22:44:43 -0500 Subject: [PATCH 04/13] Switch to bionic, add deps. for PyGObject --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0fe1ab6d..80493fbcb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: bionic services: - postgresql @@ -23,6 +23,12 @@ addons: - liquidsoap-plugin-vorbis - python3-gst-1.0 - silan + - gcc + - gir1.2-gtk-3.0 + - python3-gi + - python3-gi-cairo + - python-cairo + - pkg-config jobs: include: From 8e5359202eb106eb23ef073bd66e1e88bddb78d5 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Thu, 19 Nov 2020 08:07:10 -0500 Subject: [PATCH 05/13] Adding Libretime PPA, removing Xenial, CentOS PHP tests --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80493fbcb..7391b11f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ env: global: - 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: @@ -38,12 +42,6 @@ jobs: - language: php php: 7.2 stage: test - - language: php - php: 7.0 - stage: test - - language: php - php: 5.6 - stage: test - language: python python: 3.8 stage: test From 377dfdbff929584ec52bcefb57ba102b5dd25fb7 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Thu, 19 Nov 2020 08:55:07 -0500 Subject: [PATCH 06/13] Reverting back to Xenial --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7391b11f3..f53d7b8d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: bionic +dist: xenial services: - postgresql @@ -42,6 +42,12 @@ jobs: - language: php php: 7.2 stage: test + - language: php + php: 7.0 + stage: test + - language: php + php: 5.6 + stage: test - language: python python: 3.8 stage: test From ddd02de3b14342bf67f6797f5ca1b8f27766d5bf Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Thu, 19 Nov 2020 21:51:55 -0500 Subject: [PATCH 07/13] Adding Python 3.6 test; adding failure flexibility on Python 3.7, 3.8 --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f53d7b8d8..94c8a87b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,11 +48,14 @@ jobs: - language: php php: 5.6 stage: test +# - language: python +# python: 3.8 +# stage: test +# - language: python +# python: 3.7 +# stage: test - language: python - python: 3.8 - stage: test - - language: python - python: 3.7 + python: 3.6 stage: test - language: python python: 3.5 @@ -77,6 +80,11 @@ jobs: php: 7.3 - language: php php: 7.2 + # Ubuntu Bionic cloud image uses Python 3.6.9 + - language: python + python: 3.8 + - language: python + python: 3.7 # https://github.com/LibreTime/libretime/issues/1041 - language: python python: 3.5 From ada9dec45aa921dc185f6550d92f53a2783968ca Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Fri, 20 Nov 2020 09:23:27 -0500 Subject: [PATCH 08/13] Removing pyenv instructions --- travis/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/install.sh b/travis/install.sh index 47e36a6ce..c9bb43c78 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -6,7 +6,7 @@ if [[ -n "$TRAVIS_PHP_VERSION" ]]; then composer install fi if [[ -n "$TRAVIS_PYTHON_VERSION" ]]; then - pyenv local $TRAVIS_PYTHON_VERSION +# pyenv local $TRAVIS_PYTHON_VERSION pushd python_apps/airtime_analyzer pip3 install -e . popd From 9077db76789836bbeca4295f53064852ffc0eefc Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Fri, 20 Nov 2020 11:04:21 -0500 Subject: [PATCH 09/13] Balancing this PR with #1092 --- .travis.yml | 10 +++++----- travis/install.sh | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94c8a87b0..80ffc51c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,9 +48,9 @@ jobs: - language: php php: 5.6 stage: test -# - language: python -# python: 3.8 -# stage: test + - language: python + python: 3.8 + stage: test # - language: python # python: 3.7 # stage: test @@ -83,8 +83,8 @@ jobs: # Ubuntu Bionic cloud image uses Python 3.6.9 - language: python python: 3.8 - - language: python - python: 3.7 +# - language: python +# python: 3.7 # https://github.com/LibreTime/libretime/issues/1041 - language: python python: 3.5 diff --git a/travis/install.sh b/travis/install.sh index c9bb43c78..fe5cb591c 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -6,7 +6,8 @@ if [[ -n "$TRAVIS_PHP_VERSION" ]]; then composer install fi if [[ -n "$TRAVIS_PYTHON_VERSION" ]]; then -# pyenv local $TRAVIS_PYTHON_VERSION + pyenv install --skip-existing $TRAVIS_PYTHON_VERSION + pyenv local $TRAVIS_PYTHON_VERSION pushd python_apps/airtime_analyzer pip3 install -e . popd From ae0ed7f8b9dc571d65d64607a75b4452170ea098 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Fri, 20 Nov 2020 11:14:17 -0500 Subject: [PATCH 10/13] New push to wake up Travis Removes commented lines entirely --- .travis.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80ffc51c3..9d403de57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,12 +48,9 @@ jobs: - language: php php: 5.6 stage: test - - language: python - python: 3.8 - stage: test -# - language: python -# python: 3.7 -# stage: test + - language: python + python: 3.8 + stage: test - language: python python: 3.6 stage: test @@ -83,8 +80,6 @@ jobs: # Ubuntu Bionic cloud image uses Python 3.6.9 - language: python python: 3.8 -# - language: python -# python: 3.7 # https://github.com/LibreTime/libretime/issues/1041 - language: python python: 3.5 From 3f27d2f64032166be7f9e765699be2a050d2ee57 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Fri, 20 Nov 2020 13:36:43 -0500 Subject: [PATCH 11/13] Adding libcairo2-dev to test dependencies --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9d403de57..4196b0f19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ addons: - python3-gi-cairo - python-cairo - pkg-config + - libcairo2-dev jobs: include: From 41e1a307354f4c34a80115746d0b07b89c415b8b Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Fri, 20 Nov 2020 14:16:20 -0500 Subject: [PATCH 12/13] Removing references to pyenv local --- travis/install.sh | 2 -- travis/test.sh | 1 - 2 files changed, 3 deletions(-) diff --git a/travis/install.sh b/travis/install.sh index fe5cb591c..edcaaffb3 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -6,8 +6,6 @@ if [[ -n "$TRAVIS_PHP_VERSION" ]]; then composer install fi if [[ -n "$TRAVIS_PYTHON_VERSION" ]]; then - pyenv install --skip-existing $TRAVIS_PYTHON_VERSION - pyenv local $TRAVIS_PYTHON_VERSION pushd python_apps/airtime_analyzer pip3 install -e . popd diff --git a/travis/test.sh b/travis/test.sh index 81aad4a26..ab51c72e8 100755 --- a/travis/test.sh +++ b/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 From dd75cb1074780e4dc75bbce96660d8a5e61a0a00 Mon Sep 17 00:00:00 2001 From: Zachary Klosko Date: Fri, 20 Nov 2020 17:34:47 -0500 Subject: [PATCH 13/13] Tailoring testing to Xenial --- .travis.yml | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4196b0f19..6bf9c2f50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,24 +37,24 @@ addons: jobs: include: - - language: php - php: 7.3 - stage: test - - language: php - php: 7.2 - stage: test +# - language: php +# php: 7.3 +# stage: test +# - language: php +# php: 7.2 +# stage: test - language: php php: 7.0 stage: test - language: php php: 5.6 stage: test - - language: python - python: 3.8 - stage: test - - language: python - python: 3.6 - stage: test +# - language: python +# python: 3.8 +# stage: test +# - language: python +# python: 3.6 +# stage: test - language: python python: 3.5 stage: test @@ -74,16 +74,18 @@ jobs: tags: true allow_failures: # https://github.com/LibreTime/libretime/issues/779 - - language: php - php: 7.3 - - language: php - php: 7.2 +# - language: php +# php: 7.3 +# - language: php +# php: 7.2 # Ubuntu Bionic cloud image uses Python 3.6.9 - - language: python - python: 3.8 +# - language: python +# python: 3.8 # https://github.com/LibreTime/libretime/issues/1041 - - language: python - python: 3.5 +# - language: python +# python: 3.5 + - language: php + php: 5.6 install: ./travis/install.sh before_script: