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
25 changes: 23 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"
Comment thread
SebastianKrupinski marked this conversation as resolved.

jobs:
unit-tests:
Expand Down Expand Up @@ -100,7 +101,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@sha256:b76a062268d7342ccec549f5323a0b6dc1b6ac55b03367f474934927653f5cb5
env:
MAILNAME: mail.domain.tld
Expand All @@ -111,6 +112,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.8:latest@sha256:9232089007ddc49b42e5a7e4cc158ac373efebed6885ea0f76e3d4e5f8532bac
env:
Expand Down Expand Up @@ -148,6 +158,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 Expand Up @@ -180,6 +200,7 @@ jobs:
run: |
php -f nextcloud/occ config:system:set app.mail.debug --type bool --value true
php -f nextcloud/occ config:system:set app.mail.verify-tls-peer --type bool --value false
php -f nextcloud/occ config:system:set allow_local_remote_servers --type bool --value true
- name: Enable slow mysql query logs
if: ${{ matrix.db == 'mysql' }}
run: |
Expand Down
10 changes: 6 additions & 4 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.10.0-rc.1</version>
<version>5.11.0-dev.1</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,18 +79,20 @@ 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>
<command>OCA\Mail\Command\UpdateAccount</command>
<command>OCA\Mail\Command\UpdateImapAccount</command>
<command>OCA\Mail\Command\UpdateJmapAccount</command>
<command>OCA\Mail\Command\UpdateSystemAutoresponders</command>
<command>OCA\Mail\Command\RunMetaEstimator</command>
</commands>
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"sort-packages": true,
"allow-plugins": {
"bamarni/composer-bin-plugin": true,
"cweagans/composer-patches": true
"cweagans/composer-patches": true,
"php-http/discovery": true
},
"optimize-autoloader": true,
"autoloader-suffix": "Mail"
Expand Down Expand Up @@ -40,9 +41,9 @@
"nextcloud/kitinerary-flatpak": "^1.0",
"nextcloud/kitinerary-sys": "^2.0.0",
"phpmailer/dkimvalidator": "^0.3.1",
"psr/log": "^3.0.2",
"rubix/ml": "2.5.3",
"sabberworm/php-css-parser": "^9.4.0",
"sebastiankrupinski/jmap-client-php": "^2.0.0",
"wamania/php-stemmer": "4.0 as 3.0",
"youthweb/urllinker": "^2.1.0"
},
Expand Down
Loading
Loading