diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2022-04-19 12:38:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 12:38:21 +0300 |
| commit | 692e7935e21ca7ca44a429cae2ca1454c8554f95 (patch) | |
| tree | edd640f7129f4358b302e81d2fae7d9209688481 | |
| parent | 9cb5d0686c4791da79c6d882e2534a602a7215ce (diff) | |
| parent | 9948cbe96db7f46e2fd78dc94ded2bd6ea9789fa (diff) | |
Merge pull request #601 from nextcloud/update-master-target-versions
Update master target versions
| -rw-r--r-- | .drone.yml | 36 | ||||
| -rw-r--r-- | .github/workflows/phpunit.yml | 5 | ||||
| -rw-r--r-- | appinfo/info.xml | 2 |
3 files changed, 41 insertions, 2 deletions
@@ -35,6 +35,42 @@ type: docker --- kind: pipeline +name: integration-tests-stable24 + +clone: + depth: 1 + +steps: + - name: integration-tests-stable24 + image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php8.0:latest + environment: + CORE_BRANCH: stable24 + commands: + - /start.sh + - /wait-for-services.sh + - 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 + # use local clone + - cp -r /drone/src /var/www/html/apps/user_saml + - 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 + +trigger: + branch: + - master + - stable* + event: + - pull_request + - push + +type: docker + +--- +kind: pipeline name: integration-tests-stable23 clone: diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index 412fbe01..3bb0ffcb 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -20,11 +20,14 @@ jobs: matrix: php-versions: ['7.4', '8.0'] databases: ['sqlite'] - server-versions: ['stable21', 'stable22', 'stable23', 'master'] + server-versions: ['stable21', 'stable22', 'stable23', 'stable24', 'master'] include: - php-versions: '8.1' server-versions: 'master' databases: 'sqlite' + - php-versions: '8.1' + server-versions: 'stable24' + databases: 'sqlite' name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/appinfo/info.xml b/appinfo/info.xml index f9edb01d..ef952233 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -33,7 +33,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="21" max-version="24" /> + <nextcloud min-version="21" max-version="25" /> </dependencies> <commands> <command>OCA\User_SAML\Command\ConfigCreate</command> |