diff options
| author | Alexandre Flament <alex@al-f.net> | 2019-07-13 16:37:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-13 16:37:39 +0200 |
| commit | 5b50e116b8c66059a6cf4344989210f4c80093f2 (patch) | |
| tree | 14c27be89360b938264033658070589bc5539a30 /.travis.yml | |
| parent | 3faaf34e25db09988b113f74feb6227d3df3db95 (diff) | |
| parent | 45702b77ca4759043f3b87f24983039f21ba2c32 (diff) | |
Merge pull request #1629 from dalf/docker
Update Docker image
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 36 |
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: |