Merge pull request #2145 from nextcloud/update-stable28-target-versions

chore(CI): Adjust testing matrix for Nextcloud 28 on stable28
nextcloud · Dec 11, 2023 · 6b639ca · 6b639ca
2 parents 0f739b5 + cd48be2
commit 6b639ca
Show file tree

Hide file tree

Showing 8 changed files with 262 additions and 1,303 deletions.
diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -38,8 +38,8 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2']
-        server-versions: ['master']
+        php-versions: ['8.0', '8.1', '8.2', '8.3']
+        server-versions: ['stable28']
 
     services:
       mysql:
@@ -159,4 +159,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-mysql.result != 'success' }}; then exit 1; fi
diff --git a/.github/workflows/phpunit-oci.yml b/.github/workflows/phpunit-oci.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       oracle:
@@ -166,4 +166,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi
diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     services:
       postgres:
@@ -156,4 +156,4 @@ jobs:
 
     steps:
       - name: Summary status
-        run: if ${{ needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
+        run: if ${{ needs.phpunit-pgsql.result != 'success' }}; then exit 1; fi
diff --git a/.github/workflows/phpunit-sqlite.yml b/.github/workflows/phpunit-sqlite.yml
@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['stable28']
 
     steps:
       - name: Set app env

diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
 			"bamarni/composer-bin-plugin": true
 		},
 		"platform": {
-			"php": "8.0"
+			"php": "8.0.2"
 		}
 	},
 	"autoload": {
@@ -21,21 +21,22 @@
 		"cs:fix": "php-cs-fixer fix",
 		"cs:check": "php-cs-fixer fix --dry-run --diff",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
-		"psalm": "psalm --threads=1",
-		"psalm:update-baseline": "psalm --threads=1 --update-baseline",
-		"psalm:clear": "psalm --clear-cache && psalm --clear-global-cache",
-		"psalm:fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
+		"psalm": "psalm.phar --threads=1",
+		"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
+		"psalm:clear": "psalm.phar --clear-cache && psalm --clear-global-cache",
+		"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
 		"test:unit": "echo 'Only testing installation of the app'"
 	},
 	"require-dev": {
 		"bamarni/composer-bin-plugin": "^1.8",
 		"nextcloud/coding-standard": "1.1.1",
-		"nextcloud/ocp": "dev-master",
+		"nextcloud/ocp": "dev-stable28",
 		"phpunit/phpunit": "^9",
 		"sabre/dav": "^4.2.1",
-		"vimeo/psalm": "^4.22"
+		"psalm/phar": "^5.17",
+		"symfony/console": "5.4.24"
 	},
 	"require": {
 		"hexogen/kdtree": "^0.2.5"
 	}
-}
+}