Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 0 additions & 141 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,144 +105,3 @@ trigger:
- push

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:
depth: 1

steps:
- name: integration-tests-stable23
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php7.3:latest
environment:
CORE_BRANCH: stable23
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
- scl enable rh-php73 "bash -c '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/
- scl enable rh-php73 "bash -c '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-stable22

clone:
depth: 1

steps:
- name: integration-tests-stable22
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php7.3:latest
environment:
CORE_BRANCH: stable22
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
- scl enable rh-php73 "bash -c '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/
- scl enable rh-php73 "bash -c '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-stable21

clone:
depth: 1

steps:
- name: integration-tests-stable21
image: ghcr.io/nextcloud/continuous-integration-user_saml_shibboleth-php7.3:latest
environment:
CORE_BRANCH: stable21
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
- scl enable rh-php73 "bash -c '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/
- scl enable rh-php73 "bash -c 'cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat'"

trigger:
branch:
- master
- stable*
event:
- pull_request
- push

type: docker
2 changes: 1 addition & 1 deletion .github/workflows/composer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: install dependencies
uses: php-actions/composer@v5
with:
php_version: 7.3
php_version: 7.4
version: 1
args: -d ./3rdparty/

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
permissions:
contents: read

concurrency:
concurrency:
group: lint-php-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

Expand All @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php-versions: ["7.3", "7.4", "8.0", "8.1"]
php-versions: ["7.4", "8.0", "8.1", "8.2"]

name: php-lint

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.0', '8.1']
php-versions: ['8.0', '8.1', '8.2']
server-versions: ['master']

services:
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/phpunit-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ jobs:

strategy:
matrix:
php-versions: ['7.4', '8.0']
server-versions: ['stable21', 'stable22', 'stable23', 'stable24', 'stable25', 'master']
php-versions: ['8.0', '8.1']
server-versions: ['stable25', 'stable26', 'master']
include:
- php-versions: '8.1'
server-versions: 'master'
- php-versions: '8.1'
- php-versions: '7.4'
server-versions: 'stable25'
- php-versions: '8.1'
server-versions: 'stable24'
- php-versions: '8.2'
server-versions: 'master'
- php-versions: '8.2'
server-versions: 'stable26'
steps:
- name: Set app env
run: |
Expand Down
5 changes: 4 additions & 1 deletion 3rdparty/composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"config": {
"optimize-autoloader": true,
"classmap-authoritative": true
"classmap-authoritative": true,
"platform": {
"php": "7.4"
}
},
"require": {
"onelogin/php-saml": "^4.0",
Expand Down
20 changes: 18 additions & 2 deletions 3rdparty/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions 3rdparty/vendor/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,24 @@

// autoload.php @generated by Composer

if (PHP_VERSION_ID < 50600) {
if (!headers_sent()) {
header('HTTP/1.1 500 Internal Server Error');
}
$err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, $err);
} elseif (!headers_sent()) {
echo $err;
}
}
trigger_error(
$err,
E_USER_ERROR
);
}

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInitcc75f134f7630c1ee3a8e4d7c86f3bcc::getLoader();
Loading