From 530d40a710921fc2939d928e6b36c92105b11777 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 8 Oct 2025 16:36:46 +0200 Subject: [PATCH 1/2] ci(psalm): Fix compatibility with master Signed-off-by: Joas Schilling --- psalm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psalm.xml b/psalm.xml index 5e7c69ec..00f33997 100644 --- a/psalm.xml +++ b/psalm.xml @@ -5,7 +5,7 @@ findUnusedBaselineEntry="true" findUnusedCode="false" resolveFromConfigFile="true" - phpVersion="8.1" + phpVersion="8.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" From 99fc001b07f4d25f29bebb2e524a6ea299e357a7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 8 Oct 2025 16:41:18 +0200 Subject: [PATCH 2/2] ci: Bump versions in integration tests Signed-off-by: Joas Schilling --- .github/workflows/integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index e24467e0..3103a791 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: ['8.1'] + php-versions: ['8.4'] databases: ['sqlite', 'mysql', 'pgsql'] server-versions: ['master'] primary-storage: ['local', 'minio'] @@ -35,11 +35,11 @@ jobs: env: MINIO_ACCESS_KEY: minio MINIO_SECRET_KEY: minio123 - image: ghcr.io/nextcloud/continuous-integration-minio:latest + image: ghcr.io/nextcloud/continuous-integration-minio:latest # zizmor: ignore[unpinned-images] ports: - "9000:9000" postgres: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-17:latest # zizmor: ignore[unpinned-images] ports: - 4445:5432/tcp env: @@ -48,12 +48,12 @@ jobs: POSTGRES_DB: nextcloud options: --health-cmd pg_isready --health-interval 5s --health-timeout 2s --health-retries 5 mysql: - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest + image: ghcr.io/nextcloud/continuous-integration-mariadb-11.4:latest # zizmor: ignore[unpinned-images] ports: - 4444:3306/tcp env: - MYSQL_ROOT_PASSWORD: rootpassword - options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5 + MARIADB_ROOT_PASSWORD: rootpassword + options: --health-cmd="mariadb-admin ping" --health-interval 5s --health-timeout 2s --health-retries 5 steps: - name: Checkout server