Merge branch 'master' into docs-image.

This commit is contained in:
Dan Helfman 2019-05-20 19:23:12 -07:00
commit 932848f6c1
3 changed files with 53 additions and 18 deletions

View File

@ -1,19 +1,40 @@
pipeline:
build:
image: python:${PYTHON_VERSION}-alpine${ALPINE_VERSION}
pull: true
commands:
- python -m pip install --upgrade pip==19.1.1
- pip install tox==3.10.0
- tox
- apk add --no-cache borgbackup
- tox -e end-to-end
---
kind: pipeline
name: python-3-5-alpine-3-9
matrix:
ALPINE_VERSION:
- 3.7
- 3.9
PYTHON_VERSION:
- 3.5
- 3.6
- 3.7
steps:
- name: build
image: python:3.5-alpine3.9
pull: always
commands:
- scripts/run-tests
---
kind: pipeline
name: python-3-6-alpine-3-9
steps:
- name: build
image: python:3.6-alpine3.9
pull: always
commands:
- scripts/run-tests
---
kind: pipeline
name: python-3-7-alpine-3-9
steps:
- name: build
image: python:3.7-alpine3.9
pull: always
commands:
- scripts/run-tests
---
kind: pipeline
name: python-3-7-alpine-3-7
steps:
- name: build
image: python:3.7-alpine3.7
pull: always
commands:
- scripts/run-tests

1
NEWS
View File

@ -4,6 +4,7 @@
* Add #borgmatic Freenode IRC channel to documentation.
* Add Borg/borgmatic hosting providers section to documentation.
* Add files for building documentation into a Docker image for web serving.
* Upgrade project build server from Drone 0.8 to 1.1.
1.3.5
* #153: Support for various Borg directory environment variables (BORG_CONFIG_DIR, BORG_CACHE_DIR,

13
scripts/run-tests Executable file
View File

@ -0,0 +1,13 @@
#!/bin/sh
# This script is intended to be run from the continuous integration build
# server, and not on a developer machine. For that, see:
# https://torsion.org/borgmatic/docs/how-to/develop-on-borgmatic/
set -e
python -m pip install --upgrade pip==19.1.1
pip install tox==3.10.0
tox
apk add --no-cache borgbackup
tox -e end-to-end