From ddbf926b59c25a6162436a67c06f680108ee3e72 Mon Sep 17 00:00:00 2001 From: Hamza Date: Wed, 3 Jun 2026 15:26:19 +0200 Subject: [PATCH] chore: stable8.6 eol Signed-off-by: Hamza --- .github/workflows/npm-audit-fix.yml | 2 +- .github/workflows/phpunit.yml | 15 ++------------- .tx/backport | 1 - appinfo/info.xml | 2 +- psalm.xml | 2 +- renovate.json | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index 3ccb041747..5c9e4ad0a1 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ['main', 'stable8.3', 'stable8.5', 'stable8.6'] + branches: ['main', 'stable8.3', 'stable8.6'] name: npm-audit-fix-${{ matrix.branches }} diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index f2d9a62d27..bc6d285091 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -55,10 +55,6 @@ jobs: php-versions: ['8.2', '8.3', '8.4', '8.5'] databases: ['sqlite'] server-versions: ['master'] - include: - - php-versions: '8.1' - databases: 'sqlite' - server-versions: 'stable32' name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -131,7 +127,7 @@ jobs: matrix: php-versions: ['8.4'] databases: ['mysql'] - server-versions: ['master', 'stable34', 'stable33', 'stable32'] + server-versions: ['master', 'stable34', 'stable33'] name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} @@ -208,14 +204,7 @@ jobs: matrix: php-versions: ['8.5'] databases: ['pgsql'] - server-versions: ['master', 'stable34', 'stable33', 'stable32'] - exclude: - - php-versions: '8.5' - server-versions: 'stable32' - include: - - php-versions: '8.1' - databases: 'pgsql' - server-versions: 'stable32' + server-versions: ['master', 'stable34', 'stable33'] name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }} diff --git a/.tx/backport b/.tx/backport index 1fc9907488..93b0d0335b 100644 --- a/.tx/backport +++ b/.tx/backport @@ -1,3 +1,2 @@ stable8.3 -stable8.5 stable8.6 diff --git a/appinfo/info.xml b/appinfo/info.xml index 9a7a6c71c4..a5bcb68a95 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -44,7 +44,7 @@ - + diff --git a/psalm.xml b/psalm.xml index 3d82906a8b..c6462483fb 100644 --- a/psalm.xml +++ b/psalm.xml @@ -12,7 +12,7 @@ findUnusedCode="false" findUnusedBaselineEntry="false" findMissingOverrideAttribte="false" - phpVersion="8.1" + phpVersion="8.2" > diff --git a/renovate.json b/renovate.json index c5013a35db..886e963de6 100644 --- a/renovate.json +++ b/renovate.json @@ -22,7 +22,7 @@ "ignoreUnstable": false, "baseBranches": [ "main", - "stable8.5", + "stable8.6", "stable8.3" ], "enabledManagers": [