Skip to content

Commit

Permalink
Merge pull request #5212 from rjbs/new-ci-3.8
Browse files Browse the repository at this point in the history
import new testing from master branch to 3.8
  • Loading branch information
elliefm authored Jan 12, 2025
2 parents 36c4f34 + 12fa49d commit e0dc5a7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Cyrus IMAP CI

on:
workflow_dispatch:
push:
branches:
- master
Expand All @@ -15,7 +16,7 @@ jobs:
build:
runs-on: ubuntu-latest
container:
image: cyrusimapdocker/cyrus-buster:latest
image: ghcr.io/cyrusimap/cyrus-docker:bookworm-libs42
options: --sysctl net.ipv6.conf.all.disable_ipv6=0 --init
steps:
- uses: actions/checkout@v4
Expand All @@ -24,9 +25,6 @@ jobs:
- name: install missing or frequently-updated deps
shell: bash
run: |
cpanm IO::File::fcntl
cpanm Digest::CRC
cpanm XML::Simple # XXX could be grabbed from apt by docker image
cpanm Mail::IMAPTalk # in image, but fetch latest!
- name: setup git safe directory
shell: bash
Expand All @@ -52,14 +50,6 @@ jobs:
echo "Mail::IMAPTalk" $(cpanm --info Mail::IMAPTalk)
/usr/cyrus/libexec/master -V
/usr/cyrus/sbin/cyr_buildinfo
- name: update jmap test suite
working-directory: /srv/JMAP-TestSuite.git
shell: bash
run: |
git fetch
git checkout origin/master
git clean -f -x -d
cpanm --installdeps .
- name: set up cassandane
working-directory: cassandane
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions cassandane/cassandane.ini.dockertests
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ suppress = Rename.rename_inbox JMAPBackup Sieve.snooze_tzid MboxEvent.tls_login_
zoneinfo_dir = /usr/local/cyruslibs/share/cyrus-timezones/zoneinfo

[imaptest]
basedir = /srv/imaptest.git
basedir = /srv/imaptest
suppress = urlauth urlauth2


Expand All @@ -73,5 +73,5 @@ suppress = urlauth urlauth2
#basedir = /srv/caldavtester.git

[jmaptestsuite]
basedir = /srv/JMAP-TestSuite.git
basedir = /srv/JMAP-TestSuite
suppress =

0 comments on commit e0dc5a7

Please sign in to comment.