Merge pull request #4400 from nextcloud/update-stable31-target-versions

chore(CI): Adjust testing matrix for Nextcloud 31 on stable31
nextcloud · Jan 23, 2025 · 3e24a35 · 3e24a35
2 parents cf10feb + 10fe25c
commit 3e24a35
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/cypress-e2e.yml b/.github/workflows/cypress-e2e.yml
@@ -31,7 +31,7 @@ jobs:
         containers: [1, 2, 3]
         php-versions: [ '8.1' ]
         databases: [ 'sqlite' ]
-        server-versions: [ 'master' ]
+        server-versions: [ 'stable31' ]
 
     name: runner ${{ matrix.code-image}}-${{ matrix.containers }}
 

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -54,7 +54,7 @@ jobs:
         code-image: [ 'release', 'nightly' ]
         php-versions: ['8.1']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.code-image }}-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
@@ -126,7 +126,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
@@ -205,7 +205,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['pgsql']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
@@ -286,7 +286,7 @@ jobs:
       matrix:
         php-versions: ['8.1']
         databases: ['oci']
-        server-versions: ['master']
+        server-versions: ['stable31']
         scenarios: ['wopi', 'direct', 'federation', 'api']
 
     name: integration-${{ matrix.scenarios }}-${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}

diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
 		"psalm/phar": "^5.3",
 		"friendsofphp/php-cs-fixer": "^3.8",
 		"nextcloud/coding-standard": "^1.0",
-		"nextcloud/ocp": "dev-master",
+		"nextcloud/ocp": "dev-stable31",
 		"phpunit/phpunit": "^9.5",
 		"bamarni/composer-bin-plugin": "^1.8"
 	},

diff --git a/composer.lock b/composer.lock