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
24 changes: 22 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ permissions:
contents: read

env:
E2E_NODE_VERSION: "20" # TODO: Extract automatically using another action
E2E_NODE_VERSION: "20"
STALWART_PWD: "secretpassword"

jobs:
unit-tests:
Expand Down Expand Up @@ -94,7 +95,7 @@ jobs:
cache: 'redis'
name: ${{ matrix.nextcloud-versions }} w/ php${{ matrix.php-versions }}-${{ matrix.db }}-${{ matrix.cache }} integration tests ${{ matrix.coverage && '(coverage)' || ''}}
services:
mail-service:
mail-dovecot-service:
image: ghcr.io/christophwurst/docker-imap-devel:latest
env:
MAILNAME: mail.domain.tld
Expand All @@ -105,6 +106,15 @@ jobs:
- 143:143
- 993:993
- 4190:4190
mail-stalwart-service:
image: stalwartlabs/stalwart:v0.15.5
env:
STALWART_ADMIN_PASSWORD: ${{ env.STALWART_PWD }}
ports:
- 10080:8080
- 10025:25
- 10143:143
- 10993:993
mariadb-service:
image: ghcr.io/nextcloud/continuous-integration-mariadb-11.4:latest
env:
Expand Down Expand Up @@ -142,6 +152,16 @@ jobs:
ports:
- 6379:6379
steps:
- name: Create domain and account in Stalwart
run: |
curl -sf -X POST http://localhost:10080/api/principal \
-u "admin:${{ env.STALWART_PWD }}" \
-H 'Content-Type: application/json' \
-d '{"type":"domain","name":"example.com"}'
curl -sf -X POST http://localhost:10080/api/principal \
-u "admin:${{ env.STALWART_PWD }}" \
-H 'Content-Type: application/json' \
-d '{"type":"individual","name":"user@example.com","secrets":["mypassword"],"emails":["user@example.com"],"roles":["user"]}'
- name: Set up Nextcloud env
uses: nextcloud/setup-server-action@34b73d5b0e3633f83a52227d00cc2a6c41d01d9a # v1.0.0
with:
Expand Down
7 changes: 4 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The rating depends on the installed text processing backend. See [the rating ove

Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).
]]></description>
<version>5.8.0-dev.2</version>
<version>5.8.0-dev.3</version>
<licence>agpl</licence>
<author homepage="https://github.com/ChristophWurst">Christoph Wurst</author>
<author homepage="https://github.com/GretaD">GretaD</author>
Expand Down Expand Up @@ -79,14 +79,15 @@ Learn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud
<commands>
<command>OCA\Mail\Command\AddMissingTags</command>
<command>OCA\Mail\Command\CleanUp</command>
<command>OCA\Mail\Command\CreateAccount</command>
<command>OCA\Mail\Command\CreateImapAccount</command>
<command>OCA\Mail\Command\CreateJmapAccount</command>
<command>OCA\Mail\Command\CreateTagMigrationJobEntry</command>
<command>OCA\Mail\Command\DebugAccount</command>
<command>OCA\Mail\Command\DeleteAccount</command>
<command>OCA\Mail\Command\DiagnoseAccount</command>
<command>OCA\Mail\Command\ExportAccount</command>
<command>OCA\Mail\Command\ExportAccountThreads</command>
<command>OCA\Mail\Command\PredictImportance</command>
<command>OCA\Mail\Command\TestAccount</command>
<command>OCA\Mail\Command\SyncAccount</command>
<command>OCA\Mail\Command\Thread</command>
<command>OCA\Mail\Command\TrainAccount</command>
Expand Down
7 changes: 7 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"optimize-autoloader": true,
"autoloader-suffix": "Mail"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/sebastiankrupinski/jmap-client-php"
}
],
"require": {
"php": ">=8.1 <=8.4",
"ext-openssl": "*",
Expand Down Expand Up @@ -43,6 +49,7 @@
"psr/log": "^3.0.2",
"rubix/ml": "2.5.3",
"sabberworm/php-css-parser": "^8.9.0",
"sebastiankrupinski/jmap-client-php": "dev-main",
"wamania/php-stemmer": "4.0 as 3.0",
"youthweb/urllinker": "^2.1.0"
},
Expand Down
Loading
Loading