From 4222a52f320640d93ace07730999d94fb46f5a01 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien-nc@posteo.net>
Date: Mon, 13 Oct 2025 13:44:38 +0200
Subject: [PATCH] fix: do not use Php 8.1 with master in CI

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
---
 .github/workflows/appstore-build-publish.yml | 2 +-
 .github/workflows/integration.yml            | 8 +-------
 .github/workflows/lint.yml                   | 2 +-
 .github/workflows/phpunit.yml                | 4 ++++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/appstore-build-publish.yml b/.github/workflows/appstore-build-publish.yml
index 7da96c8b9..db2a91bdc 100644
--- a/.github/workflows/appstore-build-publish.yml
+++ b/.github/workflows/appstore-build-publish.yml
@@ -13,7 +13,7 @@ on:
     types: [published]
 
 env:
-  PHP_VERSION: 8.1
+  PHP_VERSION: 8.2
 
 jobs:
   build_and_publish:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index fa09ce9f0..f1f9552ab 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.1']
+        php-versions: ['8.2']
         databases: ['sqlite', 'mysql', 'pgsql']
         server-versions: ['master']
         include:
@@ -36,12 +36,6 @@ jobs:
             - php-versions: 8.1
               databases: mysql
               server-versions: stable32
-            - php-versions: 8.1
-              databases: mysql
-              server-versions: master
-            - php-versions: 8.2
-              databases: mysql
-              server-versions: master
             - php-versions: 8.3
               databases: mysql
               server-versions: master
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index e742a37c7..4edb7748e 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2', '8.3']
+        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
 
     name: php${{ matrix.php-versions }}
     steps:
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 41a0d9b28..8368b501a 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -34,6 +34,10 @@ jobs:
           - php-versions: 8.4
             databases: mysql
             server-versions: master
+        exclude:
+          - php-versions: 8.1
+            databases: mysql
+            server-versions: master
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}