Skip to content
Merged
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
12 changes: 10 additions & 2 deletions .github/workflows/integration-test-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,12 @@ jobs:
matrix:
php-versions: [ '8.2' ]
databases: [ 'pgsql' ]
server-versions: [ 'stable32', 'stable33', 'master' ]
server-versions: [ 'stable32', 'stable33', 'stable34' ]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master is removed here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

master is included below with encryption on, thought it was enough.
should I add one for no encryption case too?

        include:
          - server-versions: master
            databases: pgsql
            php-versions: 8.3
            encryption: 'on'

encryption: ['off']
include:
- server-versions: master
databases: pgsql
php-versions: 8.2
php-versions: 8.3
encryption: 'on'
- server-versions: stable32
databases: pgsql
Expand Down Expand Up @@ -133,6 +133,14 @@ jobs:
persist-credentials: false
ref: ${{ matrix.server-versions }}

- name: Checkout app_api
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: nextcloud/app_api
ref: ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }}
path: apps/app_api
persist-credentials: false

- name: Get backend app version
id: appinfo
uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/integration-test-file-listener.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: [ '8.2' ]
php-versions: [ '8.3' ]
databases: [ 'pgsql' ]
server-versions: [ 'master' ]
encryption: ['on']
Expand Down Expand Up @@ -125,6 +125,14 @@ jobs:
persist-credentials: false
ref: ${{ matrix.server-versions }}

- name: Checkout app_api
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
repository: nextcloud/app_api
ref: ${{ matrix.server-versions == 'master' && 'main' || matrix.server-versions }}
path: apps/app_api
persist-credentials: false

- name: Get backend app version
id: appinfo
uses: skjnldsv/xpath-action@7e6a7c379d0e9abc8acaef43df403ab4fc4f770c # master
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Refer to the [Context Chat Backend's readme](https://github.com/nextcloud/contex
<screenshot>https://raw.githubusercontent.com/nextcloud/context_chat/main/screenshots/context_chat_4.png</screenshot>
<screenshot>https://raw.githubusercontent.com/nextcloud/context_chat/main/screenshots/context_chat_5.png</screenshot>
<dependencies>
<nextcloud min-version="32" max-version="34"/>
<nextcloud min-version="32" max-version="35"/>
</dependencies>
<background-jobs>
<job>OCA\ContextChat\BackgroundJobs\FileSystemListenerJob</job>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"require": {
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4"
"php": "^8.1 || ^8.2 || ^8.3 || ^8.4 || ^8.5"
},
"require-dev": {
"nextcloud/coding-standard": "^1.3.2",
Expand Down
Loading