summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlexandre Flament <alex@al-f.net>2019-07-16 11:03:52 +0200
committerGitHub <noreply@github.com>2019-07-16 11:03:52 +0200
commit4d38b8bef7de16f741d20839ee5d31a48d499f81 (patch)
tree3ad42e60342e90d577c1f83c5e726665163a4a7d /.travis.yml
parent3b8b862d8c31e8e55f2fc6e0de74a0fcbb899c76 (diff)
parentf750df871318c435c40c7d910e5dcd47b350e73d (diff)
Merge branch 'master' into bang_fixes
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml36
1 files changed, 28 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 08bcfaadd..e37b65864 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,14 @@
+language: python
sudo: false
cache:
- pip
- npm
- directories:
- $HOME/.cache/pip
+
addons:
firefox: "latest"
-language: python
-python:
- - "2.7"
- - "3.5"
- - "3.6"
-before_install:
- - "export DISPLAY=:99.0"
- - "sh -e /etc/init.d/xvfb start"
+
install:
- ./manage.sh install_geckodriver ~/drivers
- export PATH=~/drivers:$PATH
@@ -27,6 +22,31 @@ script:
after_success:
- ./manage.sh py_test_coverage
- codecov
+
+stages:
+ - test
+ - name: docker
+ if: branch = master AND type != pull_request AND env(DOCKER_USERNAME) IS present
+
+jobs:
+ include:
+ - python: "2.7"
+ - python: "3.5"
+ - python: "3.6"
+ - stage: docker
+ python: "3.6"
+ git:
+ depth: false
+ services:
+ - docker
+ addons: []
+ before_install: true
+ install: true
+ script:
+ - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+ - ./manage.sh docker_build push
+ after_success: true
+
notifications:
irc:
channels: