From 63f33bf0637d0b008b4409451a8c0bfb1a09d147 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 8 Nov 2024 12:45:41 +0100 Subject: [PATCH 1/2] ci: Revert "ci: Don't test incompatible external storages on PHP 8.4" This reverts commit 852ccc1ae37fd3d8e2667e7445697f6e6ad97d56. Signed-off-by: Joas Schilling --- .github/workflows/files-external-smb.yml | 2 +- .github/workflows/object-storage-azure.yml | 2 +- .github/workflows/object-storage-s3.yml | 2 +- .github/workflows/object-storage-swift.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/files-external-smb.yml b/.github/workflows/files-external-smb.yml index da1544fc149af..ba89f73f1340a 100644 --- a/.github/workflows/files-external-smb.yml +++ b/.github/workflows/files-external-smb.yml @@ -41,7 +41,7 @@ jobs: strategy: matrix: - php-versions: ['8.1'] + php-versions: ['8.1', '8.4'] include: - php-versions: '8.1' coverage: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/object-storage-azure.yml b/.github/workflows/object-storage-azure.yml index 15113044d4f70..c2ca920005f00 100644 --- a/.github/workflows/object-storage-azure.yml +++ b/.github/workflows/object-storage-azure.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2'] + php-versions: ['8.1', '8.2', '8.4'] include: - php-versions: '8.3' coverage: true diff --git a/.github/workflows/object-storage-s3.yml b/.github/workflows/object-storage-s3.yml index b0f98f0712a4b..b7d966e97a6d5 100644 --- a/.github/workflows/object-storage-s3.yml +++ b/.github/workflows/object-storage-s3.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2'] + php-versions: ['8.1', '8.2', '8.4'] include: - php-versions: '8.3' coverage: true diff --git a/.github/workflows/object-storage-swift.yml b/.github/workflows/object-storage-swift.yml index 8ae73f1b8592d..5f47915d7047b 100644 --- a/.github/workflows/object-storage-swift.yml +++ b/.github/workflows/object-storage-swift.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: - php-versions: ['8.1', '8.2'] + php-versions: ['8.1', '8.2', '8.4'] include: - php-versions: '8.3' coverage: true From 55507858b0ee0830fde1e3cf61146206ced77eb3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 8 Nov 2024 15:31:45 +0100 Subject: [PATCH 2/2] ci: Revert "ci: Skip currently PHP 8.4 incompatible test" This reverts commit 298948c28ce2d01446e718f6cf96e8fe0a444c6c. Signed-off-by: Joas Schilling --- apps/dav/tests/unit/Files/FileSearchBackendTest.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/apps/dav/tests/unit/Files/FileSearchBackendTest.php b/apps/dav/tests/unit/Files/FileSearchBackendTest.php index aaa3d8c147ee8..f6fe8b1c1160a 100644 --- a/apps/dav/tests/unit/Files/FileSearchBackendTest.php +++ b/apps/dav/tests/unit/Files/FileSearchBackendTest.php @@ -55,10 +55,6 @@ class FileSearchBackendTest extends TestCase { private $davFolder; protected function setUp(): void { - if (PHP_VERSION_ID >= 80400) { - $this->markTestSkipped('SearchDAV is not yet PHP 8.4 compatible'); - } - parent::setUp(); $this->user = $this->createMock(IUser::class);