From 353ad039c82f2fac7d9a1445ea5428e6f030a95d Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 14 Mar 2025 23:53:11 +0100 Subject: [PATCH 1/4] [CI] Bump PHP versions in woodpecker --- .woodpecker/.continuous-deployment.yml | 2 +- .woodpecker/.database_checks.yml | 2 +- .woodpecker/.phpmd_check.yml | 4 ++-- .woodpecker/.phpunit.yml | 10 ++++++---- .woodpecker/.releaser.yml | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index fbcbc0576c6..ff1dd5cf803 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -41,7 +41,7 @@ steps: volumes: - /tmp/drone-cache:/tmp/cache composer_install: - image: friendicaci/php8.2:php8.2.16 + image: friendicaci/php8.2:php8.2.28 commands: - mkdir addon # create empty addon folder to appease composer - export COMPOSER_HOME=.composer diff --git a/.woodpecker/.database_checks.yml b/.woodpecker/.database_checks.yml index ea768bf1326..bf947dedaa6 100644 --- a/.woodpecker/.database_checks.yml +++ b/.woodpecker/.database_checks.yml @@ -5,7 +5,7 @@ matrix: include: - PHP_MAJOR_VERSION: 8.2 - PHP_VERSION: 8.2.16 + PHP_VERSION: 8.2.28 when: branch: diff --git a/.woodpecker/.phpmd_check.yml b/.woodpecker/.phpmd_check.yml index f03e44eec93..e527bd0431f 100644 --- a/.woodpecker/.phpmd_check.yml +++ b/.woodpecker/.phpmd_check.yml @@ -22,7 +22,7 @@ steps: - /tmp/drone-cache:/tmp/cache composer_install: - image: friendicaci/php8.3:php8.3.3 + image: friendicaci/php8.3:php8.3.17 commands: - mkdir addon # create empty addon folder to appease composer - export COMPOSER_HOME=.composer @@ -41,6 +41,6 @@ steps: - /tmp/drone-cache:/tmp/cache phpmd: - image: friendicaci/php8.3:php8.3.3 + image: friendicaci/php8.3:php8.3.17 commands: - ./bin/composer.phar run phpmd diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index 04c66bcb976..9207e16b762 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -9,11 +9,13 @@ matrix: - PHP_MAJOR_VERSION: 8.0 PHP_VERSION: 8.0.30 - PHP_MAJOR_VERSION: 8.1 - PHP_VERSION: 8.1.27 + PHP_VERSION: 8.1.31 - PHP_MAJOR_VERSION: 8.2 - PHP_VERSION: 8.2.16 + PHP_VERSION: 8.2.28 - 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...) labels: @@ -94,7 +96,7 @@ steps: when: matrix: PHP_MAJOR_VERSION: 8.2 - PHP_VERSION: 8.2.16 + PHP_VERSION: 8.2.28 repo: - friendica/friendica commands: diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index c49847ed398..d7dfd1cfb93 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -35,7 +35,7 @@ steps: volumes: - /tmp/drone-cache:/tmp/cache composer_install: - image: friendicaci/php8.2:php8.2.16 + image: friendicaci/php8.2:php8.2.28 commands: - mkdir addon # create empty addon folder to appease composer - export COMPOSER_HOME=.composer From 3121a256e2ab1d5542f154b71b667b59254c558a Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 15 Mar 2025 00:04:30 +0100 Subject: [PATCH 2/4] Workaround for git.friendi.ca issue -> enforce external access --- .woodpecker/.phpmd_check.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.woodpecker/.phpmd_check.yml b/.woodpecker/.phpmd_check.yml index e527bd0431f..7f9352ded39 100644 --- a/.woodpecker/.phpmd_check.yml +++ b/.woodpecker/.phpmd_check.yml @@ -8,6 +8,10 @@ when: exclude: [ stable ] 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: restore_cache: image: meltwater/drone-cache:dev From c6fbacd3e8659bf1eaa76348cd6894ef6238583e Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 15 Mar 2025 00:18:39 +0100 Subject: [PATCH 3/4] [CI] avoid safe.directory issues when cloning --- .woodpecker/.phpunit.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index 9207e16b762..c1a81a2fd1a 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -26,7 +26,19 @@ when: exclude: [ stable ] event: [ pull_request, push ] +skip_clone: true + 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: image: php:${PHP_MAJOR_VERSION} commands: From 5f70ae9c1ed939c31da438038c5a0485d72ceead Mon Sep 17 00:00:00 2001 From: Philipp Date: Sat, 15 Mar 2025 00:39:35 +0100 Subject: [PATCH 4/4] Avoid deprecated polluting --- tests/bootstrap.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/bootstrap.php b/tests/bootstrap.php index ee628029f45..05771f6503c 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -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.'); } +error_reporting(E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED); require __DIR__ . '/../vendor/autoload.php'; // Backward compatibility