Merge pull request #10348 from nextcloud/ci/fix-ci

[stable3.7] Fix CI
nextcloud · Nov 12, 2024 · 7c660dd · 7c660dd
2 parents 7bc30ef + 73b0f4a
commit 7c660dd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/psalm-matrix.yml b/.github/workflows/psalm-matrix.yml
@@ -18,7 +18,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master', 'dev-stable29', 'dev-stable28', 'dev-stable27' ]
+        ocp-version: [ 'dev-stable29', 'dev-stable28', 'dev-stable27' ]
 
     name: static-psalm-analysis ${{ matrix.ocp-version }}
     steps:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -10,14 +10,12 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1', '8.2', '8.3']
-        nextcloud-versions: ['master']
+        nextcloud-versions: ['stable29']
         include:
           - php-versions: '8.0'
             nextcloud-versions: 'stable27'
           - php-versions: '8.1'
             nextcloud-versions: 'stable28'
-          - php-versions: '8.2'
-            nextcloud-versions: 'stable29'
     name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
     steps:
     - name: Set up Nextcloud env
@@ -62,7 +60,7 @@ jobs:
       strategy:
           matrix:
               php-versions: ['8.3']
-              nextcloud-versions: ['master']
+              nextcloud-versions: ['stable29']
               db: ['sqlite', 'mysql', 'pgsql']
               cache: ['nocache']
               include:
@@ -74,10 +72,6 @@ jobs:
                   nextcloud-versions: stable28
                   db: 'mysql'
                   cache: 'redis'
-                - php-versions: 8.2
-                  nextcloud-versions: stable29
-                  db: 'mysql'
-                  cache: 'nocache'
       name: ${{ matrix.nextcloud-versions }} w/ php${{ matrix.php-versions }}-${{ matrix.db }}-${{ matrix.cache }} integration tests
       services:
           mail-service:

diff --git a/tests/psalm-baseline.xml b/tests/psalm-baseline.xml
@@ -8,6 +8,11 @@
       <code>OutOfOfficeListener::class</code>
       <code>OutOfOfficeListener::class</code>
       <code>OutOfOfficeListener::class</code>
+      <code><![CDATA[registerEventListener]]></code>
+      <code><![CDATA[registerEventListener]]></code>
+      <code><![CDATA[registerEventListener]]></code>
+      <code><![CDATA[registerEventListener]]></code>
+      <code><![CDATA[registerEventListener]]></code>
     </InvalidArgument>
     <MissingDependency>
       <code>FilteringProvider</code>