Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nighlty-ci-release-2-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
secrets: inherit
with:
branch: release/2.11
nextcloud_versions: "31 32"
nextcloud_versions: '31 32'
2 changes: 1 addition & 1 deletion .github/workflows/nighty-ci-release-3-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
secrets: inherit
with:
branch: release/3.0
nextcloud_versions: "33"
nextcloud_versions: '33 34'
2 changes: 1 addition & 1 deletion .github/workflows/notify-app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions .github/workflows/shared_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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' }}
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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' }}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ For more information on how to set up and use the OpenProject application, pleas
<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot1.png</screenshot>
<screenshot>https://github.com/nextcloud/integration_openproject/raw/master/img/screenshot2.png</screenshot>
<dependencies>
<nextcloud min-version="33" max-version="33" />
<nextcloud min-version="33" max-version="34" />
</dependencies>
<background-jobs>
<job>OCA\OpenProject\BackgroundJob\RemoveExpiredDirectUploadTokens</job>
Expand All @@ -60,4 +60,4 @@ For more information on how to set up and use the OpenProject application, pleas
<personal>OCA\OpenProject\Settings\Personal</personal>
<personal-section>OCA\OpenProject\Settings\PersonalSection</personal-section>
</settings>
</info>
</info>
Loading