From b9a109f92a1982d6fd794e0e789c3d8f75acbc8e Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 14:55:02 +0100 Subject: first try --- .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0e6f5283a..296243cc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ +sudo: required +dist: trusty language: php php: - - 5.5 - 5.6 - 7 - #- hhvm env: global: - CORE_BRANCH=stable8.2 @@ -15,23 +15,21 @@ matrix: - php: hhvm - env: DB=pgsql CORE_BRANCH=master include: - - php: 5.5 + - php: 5.6 env: DB=sqlite - - php: 5.5 + - php: 5.6 env: DB=mysql # master branch - - php: 5.5 + - php: 5.6 env: DB=pgsql CORE_BRANCH=master fast_finish: true before_install: - - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" - -install: - # install dependencies + - env + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start - sudo apt-get update - - sudo apt-get install -o DPkg::Options::="--force-confold" -y libxml2 libxml2-dev libxml2-utils python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox curl + - sudo apt-get install python3-setuptools apache2 libapache2-mod-fastcgi - sudo easy_install3 requests ocdev - nvm install 5.6 - npm install -g npm@latest @@ -82,3 +80,4 @@ script: addons: postgresql: "9.3" + firefox: "44" -- cgit v1.2.3 From 8cea47b9bdaf75a2df1ec98aee565683917889c1 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:02:49 +0100 Subject: debug --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 296243cc2..40af9311d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,8 @@ before_install: - env - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start + - apt-cache search libapache2-mod-fastcgi + - grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* - sudo apt-get update - sudo apt-get install python3-setuptools apache2 libapache2-mod-fastcgi - sudo easy_install3 requests ocdev -- cgit v1.2.3 From 3684705911229c93c9b30f1ca3f04a2d5458af5d Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:08:14 +0100 Subject: more try --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 40af9311d..e092f611f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,11 +28,10 @@ before_install: - env - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - - apt-cache search libapache2-mod-fastcgi - - grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* - sudo apt-get update - - sudo apt-get install python3-setuptools apache2 libapache2-mod-fastcgi + - sudo apt-get install python3-setuptools - sudo easy_install3 requests ocdev + - phpenv install $TRAVIS_PHP_VERSION # can be removed once php is supported out of the box - nvm install 5.6 - npm install -g npm@latest # install php modules -- cgit v1.2.3 From 65be882436613fd1ab0ea4d7fe758460b5e7b3ae Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:12:09 +0100 Subject: more debug --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e092f611f..cd4234479 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,11 +25,10 @@ matrix: fast_finish: true before_install: - - env - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sudo apt-get update - - sudo apt-get install python3-setuptools + - sudo apt-get install -y python3-setuptools - sudo easy_install3 requests ocdev - phpenv install $TRAVIS_PHP_VERSION # can be removed once php is supported out of the box - nvm install 5.6 @@ -52,14 +51,13 @@ before_script: - mysql -e 'create database oc_autotest;' - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';" - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';" - # set up php under apache - - bash owncloud/apps/news/tests/travis/travis-ci-apache.sh # fill owncloud with default configs and enable news - cd owncloud - mkdir data - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass='' - ./occ app:enable news - ./occ background:cron # enable default cron + - ocdev server & - cd apps/news script: -- cgit v1.2.3 From 46d4048ca4badde115d63c82947bf2667b356fa2 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:19:52 +0100 Subject: installit --- .travis.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd4234479..6db46b63e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sudo apt-get update - - sudo apt-get install -y python3-setuptools + - sudo apt-get -y install python3-setuptools - sudo easy_install3 requests ocdev - phpenv install $TRAVIS_PHP_VERSION # can be removed once php is supported out of the box - nvm install 5.6 @@ -68,13 +68,8 @@ script: - cd js - gulp karma # acceptance tests - # - webdriver-manager update - - sudo chown -R www-data:www-data ../../../data - - sudo chmod -R a+rwx ../../../data - #- grunt acceptance --verbose + #- webdriver-manager update # debug section to check what went wrong - - curl http://admin:admin@localhost/owncloud/index.php - - curl http://admin:admin@localhost/owncloud/index.php/apps/news/ - sudo cat ../../../data/owncloud.log addons: -- cgit v1.2.3 From 1f6f515eb846b3a440ae7d0c10677c81e2c7cbb2 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:24:58 +0100 Subject: remove phpenv --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6db46b63e..a37a99d55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,6 @@ env: matrix: allow_failures: - - php: hhvm - env: DB=pgsql CORE_BRANCH=master include: - php: 5.6 @@ -30,7 +29,6 @@ before_install: - sudo apt-get update - sudo apt-get -y install python3-setuptools - sudo easy_install3 requests ocdev - - phpenv install $TRAVIS_PHP_VERSION # can be removed once php is supported out of the box - nvm install 5.6 - npm install -g npm@latest # install php modules @@ -74,4 +72,4 @@ script: addons: postgresql: "9.3" - firefox: "44" + firefox: "44.0.2" -- cgit v1.2.3 From 3c6b27165dbf96a1b515757729dfc0526175360c Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:29:40 +0100 Subject: try default firefox version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a37a99d55..8daaba124 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sudo apt-get update - - sudo apt-get -y install python3-setuptools + - sudo apt-get -y install python3-setuptools firefox - sudo easy_install3 requests ocdev - nvm install 5.6 - npm install -g npm@latest @@ -72,4 +72,4 @@ script: addons: postgresql: "9.3" - firefox: "44.0.2" + #firefox: "44.0.2" -- cgit v1.2.3 From 78c0a99ad22f89c7bec3f610d6976cef92b64cbe Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:34:54 +0100 Subject: install mariadb --- .travis.yml | 5 ++--- appinfo/info.xml | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8daaba124..74fae2633 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ before_install: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - sudo apt-get update - - sudo apt-get -y install python3-setuptools firefox + - sudo apt-get -y install python3-setuptools firefox mariadb-server - sudo easy_install3 requests ocdev - nvm install 5.6 - npm install -g npm@latest @@ -71,5 +71,4 @@ script: - sudo cat ../../../data/owncloud.log addons: - postgresql: "9.3" - #firefox: "44.0.2" + #firefox: "latest" diff --git a/appinfo/info.xml b/appinfo/info.xml index f3fcb793a..c856e7602 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -24,8 +24,8 @@ 8.1 - - pgsql + + pgsql sqlite mysql libxml -- cgit v1.2.3 From e4e3fbf5effd3ff94e866f5bd9b31fc5fbed70fd Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:40:06 +0100 Subject: mysql --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74fae2633..46e4ac447 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_script: - phpenv config-add owncloud/apps/news/tests/travis/php.ini # set up databases and users for postgres and mysql - createuser -U travis -s oc_autotest - - mysql -e 'create database oc_autotest;' + - mysql -u root -e 'create database oc_autotest;' - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';" - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';" # fill owncloud with default configs and enable news -- cgit v1.2.3 From 59c5f17247219612efcee74878dad0b935a5f966 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:48:23 +0100 Subject: try without custom php ini --- .travis.yml | 7 ++----- CHANGELOG.md | 3 +++ appinfo/info.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46e4ac447..b8ec8ec15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ sudo: required dist: trusty language: php php: + - 5.5 - 5.6 - 7 env: @@ -28,7 +29,7 @@ before_install: - sh -e /etc/init.d/xvfb start - sudo apt-get update - sudo apt-get -y install python3-setuptools firefox mariadb-server - - sudo easy_install3 requests ocdev +- sudo easy_install3 requests ocdev - nvm install 5.6 - npm install -g npm@latest # install php modules @@ -43,7 +44,6 @@ before_install: - mv news owncloud/apps/ before_script: - - phpenv config-add owncloud/apps/news/tests/travis/php.ini # set up databases and users for postgres and mysql - createuser -U travis -s oc_autotest - mysql -u root -e 'create database oc_autotest;' @@ -69,6 +69,3 @@ script: #- webdriver-manager update # debug section to check what went wrong - sudo cat ../../../data/owncloud.log - -addons: - #firefox: "latest" diff --git a/CHANGELOG.md b/CHANGELOG.md index fe22b5f5d..6cce82bd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +owncloud-news (7.2.0) +* **New dependency**: Bump required PostgreSQL version to 9.4 + owncloud-news (7.1.2) * **Enhancement**: Major JavaScript library updates: * Update from Angular 1.3 to 1.5 diff --git a/appinfo/info.xml b/appinfo/info.xml index c856e7602..0f2f57b02 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -24,7 +24,7 @@ 8.1 - + pgsql sqlite mysql -- cgit v1.2.3 From a1ee8967d5232ca740a311db88b19d63a2cdb48e Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:48:53 +0100 Subject: remove 5.5 again --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b8ec8ec15..8c290c1b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: required dist: trusty language: php php: - - 5.5 - 5.6 - 7 env: -- cgit v1.2.3 From a71d7ce192d65d750c5d3ec8ecd09497a7995bae Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:50:43 +0100 Subject: try to fix yaml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c290c1b2..c970363cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ before_install: - sh -e /etc/init.d/xvfb start - sudo apt-get update - sudo apt-get -y install python3-setuptools firefox mariadb-server -- sudo easy_install3 requests ocdev + - sudo easy_install3 requests ocdev - nvm install 5.6 - npm install -g npm@latest # install php modules @@ -43,7 +43,6 @@ before_install: - mv news owncloud/apps/ before_script: - # set up databases and users for postgres and mysql - createuser -U travis -s oc_autotest - mysql -u root -e 'create database oc_autotest;' - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';" -- cgit v1.2.3 From f13839ff6071a208c0a05ecafa71de90dd34fb03 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 15:55:41 +0100 Subject: add back 5.5 --- .travis.yml | 1 + CHANGELOG.md | 1 + appinfo/info.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c970363cd..a00611bac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ sudo: required dist: trusty language: php php: + - 5.5 - 5.6 - 7 env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cce82bd3..54f019157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ owncloud-news (7.2.0) * **New dependency**: Bump required PostgreSQL version to 9.4 +* **New dependency**: Bump required MySql/MariaDB version to 5.5 owncloud-news (7.1.2) * **Enhancement**: Major JavaScript library updates: diff --git a/appinfo/info.xml b/appinfo/info.xml index 0f2f57b02..c44ff78e2 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -27,7 +27,7 @@ pgsql sqlite - mysql + mysql libxml curl SimpleXML -- cgit v1.2.3 From 7738ee6ad0c273450d6d01379e87b631aca7603b Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Sun, 21 Feb 2016 16:00:07 +0100 Subject: remove obsolete travis configs --- tests/travis/php.ini | 2 -- tests/travis/travis-ci-apache-hhvm.conf | 25 ------------------------- tests/travis/travis-ci-apache.conf | 19 ------------------- tests/travis/travis-ci-apache.sh | 18 ------------------ 4 files changed, 64 deletions(-) delete mode 100644 tests/travis/php.ini delete mode 100644 tests/travis/travis-ci-apache-hhvm.conf delete mode 100644 tests/travis/travis-ci-apache.conf delete mode 100644 tests/travis/travis-ci-apache.sh diff --git a/tests/travis/php.ini b/tests/travis/php.ini deleted file mode 100644 index 09fc2d51c..000000000 --- a/tests/travis/php.ini +++ /dev/null @@ -1,2 +0,0 @@ -default_charset = "UTF-8" -always_populate_raw_post_data = -1 diff --git a/tests/travis/travis-ci-apache-hhvm.conf b/tests/travis/travis-ci-apache-hhvm.conf deleted file mode 100644 index dbfbfae2c..000000000 --- a/tests/travis/travis-ci-apache-hhvm.conf +++ /dev/null @@ -1,25 +0,0 @@ - - - DocumentRoot %TRAVIS_BUILD_DIR% - - - Options FollowSymLinks MultiViews ExecCGI - AllowOverride All - Order deny,allow - Allow from all - - - # Configure Apache for HHVM FastCGI. - # See https://github.com/facebook/hhvm/wiki/fastcgi. - - - SetHandler hhvm-php-extension - - - Alias /hhvm /hhvm - Action hhvm-php-extension /hhvm virtual - - FastCgiExternalServer /hhvm -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 300 - - - diff --git a/tests/travis/travis-ci-apache.conf b/tests/travis/travis-ci-apache.conf deleted file mode 100644 index 5cfd3ccd0..000000000 --- a/tests/travis/travis-ci-apache.conf +++ /dev/null @@ -1,19 +0,0 @@ - - - DocumentRoot %TRAVIS_BUILD_DIR% - - - Options FollowSymLinks MultiViews ExecCGI - AllowOverride All - Order deny,allow - Allow from all - - - - AddHandler php5-fcgi .php - Action php5-fcgi /php5-fcgi - Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization - - - \ No newline at end of file diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh deleted file mode 100644 index 24af96be5..000000000 --- a/tests/travis/travis-ci-apache.sh +++ /dev/null @@ -1,18 +0,0 @@ -# set up php under apache -if [[ $(phpenv version-name) == 'hhvm' ]]; then - sudo a2enmod rewrite actions fastcgi alias - sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache-hhvm.conf /etc/apache2/sites-available/default - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default - sudo service apache2 restart - hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true -else - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf - sudo a2enmod rewrite actions fastcgi alias - echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm - sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache.conf /etc/apache2/sites-available/default - sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default - sudo service apache2 restart -fi - - -- cgit v1.2.3