mirror of
https://github.com/netzbegruenung/user_saml.git
synced 2024-05-02 17:14:53 +02:00
Merge pull request #276 from nextcloud/update-master-version
Update version on master
This commit is contained in:
GitHub
commit
0b4787b565
84
.drone.yml
84
.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
|
||||
|
|
|
|||
|
|
@ -16,16 +16,13 @@ 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.]]></description>
|
||||
<version>2.0.1</version>
|
||||
<version>2.1.0</version>
|
||||
<licence>agpl</licence>
|
||||
<author>Lukas Reschke</author>
|
||||
<namespace>User_SAML</namespace>
|
||||
<types>
|
||||
<authentication/>
|
||||
</types>
|
||||
<documentation>
|
||||
<admin>https://docs.nextcloud.com/server/13/admin_manual/configuration_server/sso_configuration.html</admin>
|
||||
</documentation>
|
||||
<category>integration</category>
|
||||
<website>https://github.com/nextcloud/user_saml</website>
|
||||
<bugs>https://github.com/nextcloud/user_saml/issues</bugs>
|
||||
|
|
@ -33,7 +30,7 @@ While theoretically any other authentication provider implementing either one of
|
|||
<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/1.png</screenshot>
|
||||
<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/2.png</screenshot>
|
||||
<dependencies>
|
||||
<nextcloud min-version="14" max-version="15" />
|
||||
<nextcloud min-version="14" max-version="16" />
|
||||
</dependencies>
|
||||
<settings>
|
||||
<admin>OCA\User_SAML\Settings\Admin</admin>
|
||||
|
|
|
|||
Loading…
Reference in a new issue