From db33af08138408efff7dca7328473c817d504cdf Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 23 Nov 2018 11:34:04 +0100 Subject: [PATCH 1/4] Update version on master Signed-off-by: Joas Schilling --- appinfo/info.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 265cefe07..200735c88 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -16,7 +16,7 @@ The following providers are supported and tested at the moment: * Any other provider that authenticates using the environment variable While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]> - 2.0.1 + 2.1.0 agpl Lukas Reschke User_SAML @@ -24,7 +24,7 @@ While theoretically any other authentication provider implementing either one of - https://docs.nextcloud.com/server/13/admin_manual/configuration_server/sso_configuration.html + https://docs.nextcloud.com/server/16/admin_manual/configuration_server/sso_configuration.html integration https://github.com/nextcloud/user_saml @@ -33,7 +33,7 @@ While theoretically any other authentication provider implementing either one of https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/1.png https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/2.png - + OCA\User_SAML\Settings\Admin From 80deb4889daabef0723d7d996a14d41e049af40c Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 23 Nov 2018 17:08:51 +0100 Subject: [PATCH 2/4] documentation moved to the portal Signed-off-by: Bjoern Schiessle --- appinfo/info.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 200735c88..1b37cdaa8 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -23,9 +23,6 @@ While theoretically any other authentication provider implementing either one of - - https://docs.nextcloud.com/server/16/admin_manual/configuration_server/sso_configuration.html - integration https://github.com/nextcloud/user_saml https://github.com/nextcloud/user_saml/issues From 56b5cdba70276997d1095eb1ae977d3270b2a2fa Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 23 Nov 2018 17:09:11 +0100 Subject: [PATCH 3/4] min version is still 14 Signed-off-by: Bjoern Schiessle --- appinfo/info.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 1b37cdaa8..0a580e4dc 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -30,7 +30,7 @@ While theoretically any other authentication provider implementing either one of https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/1.png https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/2.png - + OCA\User_SAML\Settings\Admin From a239e0267015e2e95bdeae26f9f2a58246039639 Mon Sep 17 00:00:00 2001 From: Bjoern Schiessle Date: Fri, 23 Nov 2018 17:14:40 +0100 Subject: [PATCH 4/4] run tests against all supported releases Signed-off-by: Bjoern Schiessle --- .drone.yml | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0857b7a74..6d2e7ad80 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,7 +39,7 @@ pipeline: when: matrix: TESTS: signed-off-check - php7.0: + php7.0-master: image: nextcloudci/php7.0:php7.0-19 environment: - APP_NAME=user_saml @@ -57,6 +57,42 @@ pipeline: when: matrix: TESTS: php7.0 + php7.0-stable14: + image: nextcloudci/php7.0:php7.0-19 + environment: + - APP_NAME=user_saml + - CORE_BRANCH=stable14 + - DB=sqlite + commands: + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server/apps/$APP_NAME + + # Run phpunit tests + - cd tests/unit/ + - phpunit --configuration phpunit.xml + when: + matrix: + TESTS: php7.0-stable14 + php7.0-stable15: + image: nextcloudci/php7.0:php7.0-19 + environment: + - APP_NAME=user_saml + - CORE_BRANCH=stable15 + - DB=sqlite + commands: + # Pre-setup steps + - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh + - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - cd ../server/apps/$APP_NAME + + # Run phpunit tests + - cd tests/unit/ + - phpunit --configuration phpunit.xml + when: + matrix: + TESTS: php7.0-stable15 php7.1: image: nextcloudci/php7.1:php7.1-16 environment: @@ -111,7 +147,7 @@ pipeline: when: matrix: TESTS: php7.3 - integration-tests: + integration-tests-master: image: nextcloudci/user_saml_shibboleth-php7:user_saml_shibboleth_php7-5 environment: - CORE_BRANCH=master @@ -131,6 +167,46 @@ pipeline: when: matrix: TESTS: integration-tests + integration-tests-stable14: + image: nextcloudci/user_saml_shibboleth-php7:user_saml_shibboleth_php7-5 + environment: + - CORE_BRANCH=stable14 + commands: + - /start.sh & + - sleep 3 + - scl enable rh-php70 bash + - rm -rf /var/www/html + - cd /var/www/ + - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html + - cd /var/www/html && git submodule update --init + - cd /var/www/html/apps/ && git clone -b $DRONE_BRANCH https://github.com/nextcloud/user_saml.git + - php /var/www/html/occ maintenance:install --database sqlite --admin-pass password + - php /var/www/html/occ app:enable user_saml + - chown -R apache:apache /var/www/html/ + - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat + when: + matrix: + TESTS: integration-tests-stable14 + integration-tests-stable15: + image: nextcloudci/user_saml_shibboleth-php7:user_saml_shibboleth_php7-5 + environment: + - CORE_BRANCH=stable15 + commands: + - /start.sh & + - sleep 3 + - scl enable rh-php70 bash + - rm -rf /var/www/html + - cd /var/www/ + - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html + - cd /var/www/html && git submodule update --init + - cd /var/www/html/apps/ && git clone -b $DRONE_BRANCH https://github.com/nextcloud/user_saml.git + - php /var/www/html/occ maintenance:install --database sqlite --admin-pass password + - php /var/www/html/occ app:enable user_saml + - chown -R apache:apache /var/www/html/ + - cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat + when: + matrix: + TESTS: integration-tests-stable15 matrix: include: @@ -138,5 +214,9 @@ matrix: - TESTS: php7.1 - TESTS: php7.2 - TESTS: php7.3 + - TESTS: php7.0-stable14 + - TESTS: php7.0-stable15 - TESTS: check-app-compatbility - TESTS: integration-tests + - TESTS: integration-tests-stable14 + - TESTS: integration-tests-stable15