From 904bf11e54a1d8f2f9c0a37d6f89d23389f1cfcf Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 15 Mar 2024 22:55:48 +0100 Subject: [PATCH 1/5] [CI] Add PHP 8.3 --- .woodpecker/.phpunit.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index a6c5db09..e6b761c4 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -8,6 +8,8 @@ matrix: PHP_VERSION: 8.1.23 - PHP_MAJOR_VERSION: 8.2 PHP_VERSION: 8.2.11 + - PHP_MAJOR_VERSION: 8.3 + PHP_VERSION: 8.3.3 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...) labels: From 7e890124a8357b68f800fe9a292a6a55a86d3443 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 15 Mar 2024 23:03:44 +0100 Subject: [PATCH 2/5] Update PHP 8.1 and PHP 8.2 CI image --- .woodpecker/.phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index e6b761c4..c590b933 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -5,9 +5,9 @@ matrix: - PHP_MAJOR_VERSION: 8.0 PHP_VERSION: 8.0.30 - PHP_MAJOR_VERSION: 8.1 - PHP_VERSION: 8.1.23 + PHP_VERSION: 8.1.27 - PHP_MAJOR_VERSION: 8.2 - PHP_VERSION: 8.2.11 + PHP_VERSION: 8.2.16 - PHP_MAJOR_VERSION: 8.3 PHP_VERSION: 8.3.3 From 372a850103fd313c0e1d55a0eee8cac1216ee56a Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 15 Mar 2024 23:06:13 +0100 Subject: [PATCH 3/5] Use PHP 8.2 for codecoverage --- .woodpecker/.phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index c590b933..207bb207 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -89,8 +89,8 @@ pipeline: image: friendicaci/codecov when: matrix: - PHP_MAJOR_VERSION: 7.4 - PHP_VERSION: 7.4.33 + PHP_MAJOR_VERSION: 8.2 + PHP_VERSION: 8.2.16 repo: - friendica/friendica-addons commands: From 57c4735ad6751afbbb4976afaaf51bcabad4da27 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 15 Mar 2024 23:08:52 +0100 Subject: [PATCH 4/5] Use PHP 8.2 for other pipelines --- .woodpecker/.continuous-deployment.yml | 2 +- .woodpecker/.releaser.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml index ab6e07e9..3756a8bf 100644 --- a/.woodpecker/.continuous-deployment.yml +++ b/.woodpecker/.continuous-deployment.yml @@ -45,7 +45,7 @@ pipeline: branch: [ develop, '*-rc' ] event: push composer_install: - image: friendicaci/php7.4:php7.4.33 + image: friendicaci/php8.2:php8.2.16 commands: - export COMPOSER_HOME=.composer - composer validate diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml index 4a661937..5751f07f 100644 --- a/.woodpecker/.releaser.yml +++ b/.woodpecker/.releaser.yml @@ -42,7 +42,7 @@ pipeline: repo: friendica/friendica-addons event: tag composer_install: - image: friendicaci/php7.4:php7.4.33 + image: friendicaci/php8.2:php8.2.16 commands: - export COMPOSER_HOME=.composer - composer validate From e1f27d88b77bddeae44a768b3e3d37c09977fbe6 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 15 Mar 2024 23:15:42 +0100 Subject: [PATCH 5/5] Fixup :) --- .woodpecker/.phpunit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml index 207bb207..1e6189d3 100644 --- a/.woodpecker/.phpunit.yml +++ b/.woodpecker/.phpunit.yml @@ -78,7 +78,7 @@ pipeline: - cp config/local-sample.config.php config/local.config.php - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql - - if [ "${PHP_MAJOR_VERSION}" = "7.4" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then + - if [ "${PHP_MAJOR_VERSION}" = "8.2" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then phpenmod xdebug; export XDEBUG_MODE=coverage; phpunit --configuration tests/phpunit-addons.xml --coverage-clover clover.xml;