sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-27 14:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify definition of DAV_SERVERs

Browse source
This commit is contained in:
Hugo Osvaldo Barrera 2021-06-12 13:46:21 +02:00
parent b0f08e051a
commit 8cd4a44d02
4 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.builds/archlinux.yaml
View file

@ -24,6 +24,7 @@ environment:
BUILD: test BUILD: test
CI: true CI: true
CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79 CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79
DAV_SERVER: radicale xandikos
REQUIREMENTS: release REQUIREMENTS: release
# TODO: ETESYNC_TESTS # TODO: ETESYNC_TESTS
tasks: tasks:
@ -32,11 +33,10 @@ tasks:
python setup.py build python setup.py build
sudo pip install --no-index . sudo pip install --no-index .
sudo systemctl start docker sudo systemctl start docker
DAV_SERVER="radicale xandikos" make -e install-servers make -e install-servers
- test: | - test: |
cd vdirsyncer cd vdirsyncer
# Non-system python is used for packages: # Non-system python is used for packages:
export PATH=$PATH:~/.local/bin/ export PATH=$PATH:~/.local/bin/
make -e ci-test make -e ci-test
DAV_SERVER=radicale make -e ci-test-storage make -e ci-test-storage
DAV_SERVER=xandikos make -e ci-test-storage

6
.builds/tests-minimal.yaml
View file

@ -14,17 +14,17 @@ environment:
BUILD: test BUILD: test
CI: true CI: true
CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79 CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79
DAV_SERVER: radicale xandikos
REQUIREMENTS: minimal REQUIREMENTS: minimal
# TODO: ETESYNC_TESTS # TODO: ETESYNC_TESTS
tasks: tasks:
- setup: | - setup: |
cd vdirsyncer cd vdirsyncer
sudo systemctl start docker sudo systemctl start docker
DAV_SERVER="radicale xandikos" make -e install-test make -e install-test
- test: | - test: |
cd vdirsyncer cd vdirsyncer
# Non-system python is used for packages: # Non-system python is used for packages:
export PATH=$PATH:~/.local/bin/ export PATH=$PATH:~/.local/bin/
make -e ci-test make -e ci-test
DAV_SERVER=radicale make -e ci-test-storage make -e ci-test-storage
DAV_SERVER=xandikos make -e ci-test-storage

7
.builds/tests-release.yaml
View file

@ -11,22 +11,21 @@ environment:
BUILD: test BUILD: test
CI: true CI: true
CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79 CODECOV_TOKEN: b834a3c5-28fa-4808-9bdb-182210069c79
DAV_SERVER: baikal radicale xandikos
REQUIREMENTS: release REQUIREMENTS: release
# TODO: ETESYNC_TESTS # TODO: ETESYNC_TESTS
tasks: tasks:
- setup: | - setup: |
cd vdirsyncer cd vdirsyncer
sudo systemctl start docker sudo systemctl start docker
DAV_SERVER="radicale xandikos baikal" make -e install-test make -e install-test
make -e install-style make -e install-style
- test: | - test: |
cd vdirsyncer cd vdirsyncer
# Non-system python is used for packages: # Non-system python is used for packages:
export PATH=$PATH:~/.local/bin/ export PATH=$PATH:~/.local/bin/
make -e ci-test make -e ci-test
DAV_SERVER=baikal make -e ci-test-storage make -e ci-test-storage
DAV_SERVER=radicale make -e ci-test-storage
DAV_SERVER=xandikos make -e ci-test-storage
- style: | - style: |
cd vdirsyncer cd vdirsyncer
# Non-system python is used for packages: # Non-system python is used for packages:

5
Makefile
View file

@ -50,7 +50,10 @@ ci-test:
ci-test-storage: ci-test-storage:
curl -s https://codecov.io/bash > $(CODECOV_PATH) curl -s https://codecov.io/bash > $(CODECOV_PATH)
$(PYTEST) tests/storage/ set -ex; \
for server in $(DAV_SERVER); do \
DAV_SERVER=$$server $(PYTEST) --cov-append tests/storage; \
done
bash $(CODECOV_PATH) -c -F storage bash $(CODECOV_PATH) -c -F storage
test: test: