From 9d3e3ca9e95f0c5fcdc5050fe02efbb19c232c25 Mon Sep 17 00:00:00 2001 From: nabim777 Date: Tue, 7 Jul 2026 16:56:33 +0545 Subject: [PATCH 1/4] chore: add support of php 8.5 and remove support of php 8.2 Signed-off-by: nabim777 --- .github/workflows/app-upgrade.yml | 4 ++-- .github/workflows/shared_workflow.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/app-upgrade.yml b/.github/workflows/app-upgrade.yml index 427cb735f..e2d0c8f84 100644 --- a/.github/workflows/app-upgrade.yml +++ b/.github/workflows/app-upgrade.yml @@ -16,7 +16,7 @@ on: php_versions: required: false type: string - default: '8.3' + default: '8.4' jobs: create-matrix: @@ -32,7 +32,7 @@ jobs: env: NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }} PHP_VERSIONS: ${{ inputs.php_versions }} - DEFAULT_PHP_VERSION: '8.3' + DEFAULT_PHP_VERSION: '8.4' DEFAULT_DATABASE: 'mysql' run: | MATRIX=$(./.github/scripts/generate-matrix.sh) diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml index 35232dfe0..b3a495586 100644 --- a/.github/workflows/shared_workflow.yml +++ b/.github/workflows/shared_workflow.yml @@ -14,7 +14,7 @@ on: php_versions: required: false type: string - default: '8.2 8.3 8.4' + default: '8.3 8.4 8.5' name: CI @@ -93,7 +93,7 @@ jobs: env: NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }} PHP_VERSIONS: ${{ inputs.php_versions }} - DEFAULT_PHP_VERSION: '8.3' + DEFAULT_PHP_VERSION: '8.4' DEFAULT_DATABASE: 'mysql' EXTRA_DATABASES: 'pgsql' run: | From 3b7245c774436209ba22e4b8179eccfac8dbbdcf Mon Sep 17 00:00:00 2001 From: nabim777 Date: Wed, 8 Jul 2026 10:03:57 +0545 Subject: [PATCH 2/4] add step composer update for php8.5 Signed-off-by: nabim777 --- .github/workflows/shared_workflow.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml index b3a495586..346dd61ef 100644 --- a/.github/workflows/shared_workflow.yml +++ b/.github/workflows/shared_workflow.yml @@ -217,7 +217,12 @@ jobs: key: ${{ runner.os }}-composer-${{ hashFiles('./composer.lock') }} restore-keys: ${{ runner.os }}-composer- - - name: Install PHP dependencies + - name: Composer update + if: ${{ format('{0}.{1}', matrix.phpVersionMajor, matrix.phpVersionMinor) == '8.5' }} + run: composer update + + - name: Composer install + if: ${{ format('{0}.{1}', matrix.phpVersionMajor, matrix.phpVersionMinor) != '8.5' }} run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Prepare Nextcloud server (for phpunit and psalm) From faf8c154302709b935eb6bbb51c193f8f2934860 Mon Sep 17 00:00:00 2001 From: nabim777 Date: Wed, 8 Jul 2026 10:25:53 +0545 Subject: [PATCH 3/4] chore: update database image Signed-off-by: nabim777 --- .github/workflows/app-upgrade.yml | 2 +- .github/workflows/shared_workflow.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/app-upgrade.yml b/.github/workflows/app-upgrade.yml index e2d0c8f84..0f35166bf 100644 --- a/.github/workflows/app-upgrade.yml +++ b/.github/workflows/app-upgrade.yml @@ -65,7 +65,7 @@ jobs: - ${{ github.workspace }}/build-app:/var/www/html/build-app-shared database-mysql: - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.5:latest + image: ghcr.io/nextcloud/continuous-integration-mariadb-11.8:latest env: MYSQL_ROOT_PASSWORD: 'nextcloud' MYSQL_PASSWORD: 'nextcloud' diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml index 346dd61ef..629f5a142 100644 --- a/.github/workflows/shared_workflow.yml +++ b/.github/workflows/shared_workflow.yml @@ -129,14 +129,14 @@ jobs: - ${{ github.workspace }}:/var/www/html/apps-shared database-pgsql: - image: ghcr.io/nextcloud/continuous-integration-postgres-14:latest + image: ghcr.io/nextcloud/continuous-integration-postgres-18:latest env: POSTGRES_PASSWORD: postgres POSTGRES_USER: postgres POSTGRES_DB: nextcloud database-mysql: - image: ghcr.io/nextcloud/continuous-integration-mariadb-10.5:latest + image: ghcr.io/nextcloud/continuous-integration-mariadb-11.8:latest env: MYSQL_ROOT_PASSWORD: 'nextcloud' MYSQL_PASSWORD: 'nextcloud' From 606d1898f38dd7537b3f635e69f24356ce982952 Mon Sep 17 00:00:00 2001 From: nabim777 Date: Wed, 8 Jul 2026 14:47:22 +0545 Subject: [PATCH 4/4] chore/ci: provide php version dynamically on php code summary Signed-off-by: nabim777 --- .github/workflows/shared_workflow.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml index 629f5a142..09f23b7d8 100644 --- a/.github/workflows/shared_workflow.yml +++ b/.github/workflows/shared_workflow.yml @@ -99,8 +99,10 @@ jobs: run: | MATRIX=$(./.github/scripts/generate-matrix.sh) echo "matrix={\"include\": [$MATRIX]}" >> $GITHUB_OUTPUT + echo "default_php_version=${DEFAULT_PHP_VERSION}" >> $GITHUB_OUTPUT outputs: matrix: ${{ steps.create-matrix.outputs.matrix }} + default_php_version: ${{ steps.create-matrix.outputs.default_php_version }} api-phpunit-tests: name: PHP Unit & API tests @@ -218,11 +220,11 @@ jobs: restore-keys: ${{ runner.os }}-composer- - name: Composer update - if: ${{ format('{0}.{1}', matrix.phpVersionMajor, matrix.phpVersionMinor) == '8.5' }} + if: ${{ matrix.phpVersion == '8.5' }} run: composer update - name: Composer install - if: ${{ format('{0}.{1}', matrix.phpVersionMajor, matrix.phpVersionMinor) != '8.5' }} + if: ${{ matrix.phpVersion != '8.5' }} run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Prepare Nextcloud server (for phpunit and psalm) @@ -263,14 +265,14 @@ jobs: make phpunit || (echo "A few of the unit tests were unsuccessful. Rerunning the unit test once again......" && make phpunit) - name: Setup .NET Core # this is required to execute Convert PHP cobertura coverage to lcov step - if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }} + if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }} uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 with: dotnet-version: 6.0.101 dotnet-quality: 'ga' - name: Convert PHP cobertura coverage to lcov - if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }} + if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }} uses: danielpalme/ReportGenerator-GitHub-Action@abaac9fef72e4116bfc69905d51062790bda0335 with: reports: 'integration_openproject/server/apps/integration_openproject/coverage/php/cobertura.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported. @@ -289,7 +291,7 @@ jobs: toolpath: 'reportgeneratortool' # Default directory for installing the dotnet tool. - name: PHP Code Coverage Summary Report - if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }} + if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }} uses: romeovs/lcov-reporter-action@dda1c9b1fa1622b225e9acd87a248751dbcc6ada with: github-token: ${{ secrets.GITHUB_TOKEN }} @@ -298,7 +300,7 @@ jobs: title: 'PHP Code Coverage' - name: PHP coverage check - if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == '8.2' }} + if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' && matrix.phpVersion == needs.create-matrix.outputs.default_php_version }} uses: VeryGoodOpenSource/very_good_coverage@3b475421464c564c0714d92ce02742bd81fa9eda with: min_coverage: '56'