From e61a6e411bb2004ddeec876b2110c1af1f487ba8 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Mon, 18 May 2026 11:44:06 +0545 Subject: [PATCH 1/4] feat: bump max NC version to 34 Signed-off-by: Saw-jan --- appinfo/info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/info.xml b/appinfo/info.xml index 534e79717..c9cfaaaea 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -49,7 +49,7 @@ For more information on how to set up and use the OpenProject application, pleas https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot1.png https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot2.png - + OCA\OpenProject\BackgroundJob\RemoveExpiredDirectUploadTokens @@ -60,4 +60,4 @@ For more information on how to set up and use the OpenProject application, pleas OCA\OpenProject\Settings\Personal OCA\OpenProject\Settings\PersonalSection - + \ No newline at end of file From 46a72c3841f993f6be8e2e3db5a61d72e001e157 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Mon, 18 May 2026 11:46:35 +0545 Subject: [PATCH 2/4] ci: add NC 34 to the CI Signed-off-by: Saw-jan --- .../workflows/nighlty-ci-release-2-branch.yml | 2 +- .../workflows/nighty-ci-release-3-branch.yml | 2 +- .github/workflows/notify-app-release.yml | 2 +- .github/workflows/shared_workflow.yml | 18 +++++++++--------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nighlty-ci-release-2-branch.yml b/.github/workflows/nighlty-ci-release-2-branch.yml index 159007a07..e08546fa0 100644 --- a/.github/workflows/nighlty-ci-release-2-branch.yml +++ b/.github/workflows/nighlty-ci-release-2-branch.yml @@ -15,4 +15,4 @@ jobs: secrets: inherit with: branch: release/2.11 - nextcloud_versions: "31 32" \ No newline at end of file + nextcloud_versions: '31 32' diff --git a/.github/workflows/nighty-ci-release-3-branch.yml b/.github/workflows/nighty-ci-release-3-branch.yml index 568a1555a..f2ef0b2a5 100644 --- a/.github/workflows/nighty-ci-release-3-branch.yml +++ b/.github/workflows/nighty-ci-release-3-branch.yml @@ -15,4 +15,4 @@ jobs: secrets: inherit with: branch: release/3.0 - nextcloud_versions: "33" \ No newline at end of file + nextcloud_versions: '33 34' diff --git a/.github/workflows/notify-app-release.yml b/.github/workflows/notify-app-release.yml index 5399f88e8..99bfbe30c 100644 --- a/.github/workflows/notify-app-release.yml +++ b/.github/workflows/notify-app-release.yml @@ -22,5 +22,5 @@ jobs: ELEMENT_ROOM_ID: ${{ secrets.ELEMENT_ROOM_ID }} NIGHTLY_CI_USER_TOKEN: ${{ secrets.NIGHTLY_CI_USER_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REPO_NAMES: "server groupfolders oidc user_oidc terms_of_service" + REPO_NAMES: 'server groupfolders oidc user_oidc terms_of_service' run: ./.github/scripts/notify-nc-and-apps-releases.sh diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml index 9b3d8d7fa..3a959434f 100644 --- a/.github/workflows/shared_workflow.yml +++ b/.github/workflows/shared_workflow.yml @@ -10,11 +10,11 @@ on: nextcloud_versions: required: false type: string - default: "33" + default: '33 34' php_versions: required: false type: string - default: "8.2 8.3 8.4" + default: '8.2 8.3 8.4' name: CI @@ -66,7 +66,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} lcov-file: ./coverage/jest/lcov.info delete-old-comments: true - title: "JS Code Coverage" + title: 'JS Code Coverage' - name: JS coverage check if: ${{ github.event_name == 'pull_request' }} @@ -93,9 +93,9 @@ jobs: env: NEXTCLOUD_VERSIONS: ${{ inputs.nextcloud_versions }} PHP_VERSIONS: ${{ inputs.php_versions }} - DEFAULT_PHP_VERSION: "8.3" - DEFAULT_DATABASE: "mysql" - EXTRA_DATABASES: "pgsql" + DEFAULT_PHP_VERSION: '8.3' + DEFAULT_DATABASE: 'mysql' + EXTRA_DATABASES: 'pgsql' run: | MATRIX=$(./.github/scripts/generate-matrix.sh) echo "matrix={\"include\": [$MATRIX]}" >> $GITHUB_OUTPUT @@ -120,8 +120,8 @@ jobs: env: SQL: ${{ matrix.database }} SERVER_BRANCH: ${{ matrix.nextcloudVersion }} - NEXTCLOUD_AUTOINSTALL: "Yes" - WITH_REDIS: "YES" + NEXTCLOUD_AUTOINSTALL: 'Yes' + WITH_REDIS: 'YES' ports: - 80:80 options: --name=nextcloud @@ -290,7 +290,7 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} lcov-file: 'integration_openproject/server/apps/integration_openproject/coverage/php/lcov.info' delete-old-comments: true - title: "PHP Code Coverage" + title: 'PHP Code Coverage' - name: PHP coverage check if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'stable33'&& matrix.phpVersion == '8.2' }} From 2020bb97d48def0cc8bccf2df7bd49a8145702a0 Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Tue, 19 May 2026 14:23:43 +0545 Subject: [PATCH 3/4] chore: add changelog entry Signed-off-by: Saw-jan --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5770030c7..0e646ee32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added +- Support Nextcloud 34 [#1021](https://github.com/nextcloud/integration_openproject/pull/1021) + ### Changed ### Removed From 9115ccabdebfd6bd1260c4806d4bfd34de7a787b Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Tue, 19 May 2026 14:28:36 +0545 Subject: [PATCH 4/4] debug Signed-off-by: Saw-jan --- .github/workflows/shared_workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/shared_workflow.yml b/.github/workflows/shared_workflow.yml index 3a959434f..7fa5585ad 100644 --- a/.github/workflows/shared_workflow.yml +++ b/.github/workflows/shared_workflow.yml @@ -248,7 +248,7 @@ jobs: # enable app even if it is not compatible with the master branch ./occ a:e -f activity oidc user_oidc groupfolders integration_openproject else - ./occ a:e activity oidc user_oidc groupfolders integration_openproject + ./occ a:e -f activity oidc user_oidc groupfolders integration_openproject cp -r apps/oidc apps/user_oidc apps/groupfolders ${{ github.workspace }} fi @@ -320,7 +320,7 @@ jobs: # enable app even if it is not compatible with the master branch docker exec nextcloud /bin/bash -c 'occ a:e -f activity oidc user_oidc groupfolders integration_openproject' else - docker exec nextcloud /bin/bash -c 'occ a:e activity oidc user_oidc groupfolders integration_openproject' + docker exec nextcloud /bin/bash -c 'occ a:e -f activity oidc user_oidc groupfolders integration_openproject' fi - name: API Tests