mirror of
https://git.friendi.ca/friendica/friendica.git
synced 2025-06-07 18:44:26 +02:00
Merge branch 'develop' into phpstan-level-3
This commit is contained in:
commit
77e785dd7d
6 changed files with 28 additions and 9 deletions
|
@ -41,7 +41,7 @@ steps:
|
||||||
volumes:
|
volumes:
|
||||||
- /tmp/drone-cache:/tmp/cache
|
- /tmp/drone-cache:/tmp/cache
|
||||||
composer_install:
|
composer_install:
|
||||||
image: friendicaci/php8.2:php8.2.16
|
image: friendicaci/php8.2:php8.2.28
|
||||||
commands:
|
commands:
|
||||||
- mkdir addon # create empty addon folder to appease composer
|
- mkdir addon # create empty addon folder to appease composer
|
||||||
- export COMPOSER_HOME=.composer
|
- export COMPOSER_HOME=.composer
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- PHP_MAJOR_VERSION: 8.2
|
- PHP_MAJOR_VERSION: 8.2
|
||||||
PHP_VERSION: 8.2.16
|
PHP_VERSION: 8.2.28
|
||||||
|
|
||||||
when:
|
when:
|
||||||
branch:
|
branch:
|
||||||
|
|
|
@ -8,6 +8,10 @@ when:
|
||||||
exclude: [ stable ]
|
exclude: [ stable ]
|
||||||
event: [ pull_request, push ]
|
event: [ pull_request, push ]
|
||||||
|
|
||||||
|
# This forces PHP Unit executions at the "opensocial" labeled location (because of access issues with git.friendi.ca)
|
||||||
|
labels:
|
||||||
|
location: opensocial
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
restore_cache:
|
restore_cache:
|
||||||
image: meltwater/drone-cache:dev
|
image: meltwater/drone-cache:dev
|
||||||
|
@ -22,7 +26,7 @@ steps:
|
||||||
- /tmp/drone-cache:/tmp/cache
|
- /tmp/drone-cache:/tmp/cache
|
||||||
|
|
||||||
composer_install:
|
composer_install:
|
||||||
image: friendicaci/php8.3:php8.3.3
|
image: friendicaci/php8.3:php8.3.17
|
||||||
commands:
|
commands:
|
||||||
- mkdir addon # create empty addon folder to appease composer
|
- mkdir addon # create empty addon folder to appease composer
|
||||||
- export COMPOSER_HOME=.composer
|
- export COMPOSER_HOME=.composer
|
||||||
|
@ -41,6 +45,6 @@ steps:
|
||||||
- /tmp/drone-cache:/tmp/cache
|
- /tmp/drone-cache:/tmp/cache
|
||||||
|
|
||||||
phpmd:
|
phpmd:
|
||||||
image: friendicaci/php8.3:php8.3.3
|
image: friendicaci/php8.3:php8.3.17
|
||||||
commands:
|
commands:
|
||||||
- ./bin/composer.phar run phpmd
|
- ./bin/composer.phar run phpmd
|
||||||
|
|
|
@ -9,11 +9,13 @@ matrix:
|
||||||
- PHP_MAJOR_VERSION: 8.0
|
- PHP_MAJOR_VERSION: 8.0
|
||||||
PHP_VERSION: 8.0.30
|
PHP_VERSION: 8.0.30
|
||||||
- PHP_MAJOR_VERSION: 8.1
|
- PHP_MAJOR_VERSION: 8.1
|
||||||
PHP_VERSION: 8.1.27
|
PHP_VERSION: 8.1.31
|
||||||
- PHP_MAJOR_VERSION: 8.2
|
- PHP_MAJOR_VERSION: 8.2
|
||||||
PHP_VERSION: 8.2.16
|
PHP_VERSION: 8.2.28
|
||||||
- PHP_MAJOR_VERSION: 8.3
|
- PHP_MAJOR_VERSION: 8.3
|
||||||
PHP_VERSION: 8.3.3
|
PHP_VERSION: 8.3.17
|
||||||
|
- PHP_MAJOR_VERSION: 8.4
|
||||||
|
PHP_VERSION: 8.4.5
|
||||||
|
|
||||||
# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
|
# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
|
||||||
labels:
|
labels:
|
||||||
|
@ -24,7 +26,19 @@ when:
|
||||||
exclude: [ stable ]
|
exclude: [ stable ]
|
||||||
event: [ pull_request, push ]
|
event: [ pull_request, push ]
|
||||||
|
|
||||||
|
skip_clone: true
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
clone:
|
||||||
|
image: alpine/git
|
||||||
|
commands:
|
||||||
|
- git config --global user.email "no-reply@friendi.ca"
|
||||||
|
- git config --global user.name "Friendica"
|
||||||
|
- git config --global --add safe.directory $CI_WORKSPACE
|
||||||
|
- git clone $CI_REPO_CLONE_URL .
|
||||||
|
- git checkout $CI_COMMIT_BRANCH
|
||||||
|
- git fetch origin $CI_COMMIT_REF
|
||||||
|
- git merge $CI_COMMIT_SHA
|
||||||
php-lint:
|
php-lint:
|
||||||
image: php:${PHP_MAJOR_VERSION}
|
image: php:${PHP_MAJOR_VERSION}
|
||||||
commands:
|
commands:
|
||||||
|
@ -101,7 +115,7 @@ steps:
|
||||||
when:
|
when:
|
||||||
matrix:
|
matrix:
|
||||||
PHP_MAJOR_VERSION: 8.2
|
PHP_MAJOR_VERSION: 8.2
|
||||||
PHP_VERSION: 8.2.16
|
PHP_VERSION: 8.2.28
|
||||||
repo:
|
repo:
|
||||||
- friendica/friendica
|
- friendica/friendica
|
||||||
commands:
|
commands:
|
||||||
|
|
|
@ -35,7 +35,7 @@ steps:
|
||||||
volumes:
|
volumes:
|
||||||
- /tmp/drone-cache:/tmp/cache
|
- /tmp/drone-cache:/tmp/cache
|
||||||
composer_install:
|
composer_install:
|
||||||
image: friendicaci/php8.2:php8.2.16
|
image: friendicaci/php8.2:php8.2.28
|
||||||
commands:
|
commands:
|
||||||
- mkdir addon # create empty addon folder to appease composer
|
- mkdir addon # create empty addon folder to appease composer
|
||||||
- export COMPOSER_HOME=.composer
|
- export COMPOSER_HOME=.composer
|
||||||
|
|
|
@ -11,6 +11,7 @@ if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
|
||||||
die('Vendor path not found. Please execute "bin/composer.phar install" on the command line in the web root.');
|
die('Vendor path not found. Please execute "bin/composer.phar install" on the command line in the web root.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED);
|
||||||
require __DIR__ . '/../vendor/autoload.php';
|
require __DIR__ . '/../vendor/autoload.php';
|
||||||
|
|
||||||
// Backward compatibility
|
// Backward compatibility
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue