Merge pull request #123 from kiwix/deploy_on_tags
We must run the deploy command even on tag push.
This commit is contained in:
commit
5f20f9939c
18
.travis.yml
18
.travis.yml
|
@ -1,6 +1,10 @@
|
||||||
language: cpp
|
language: cpp
|
||||||
dist: trusty
|
dist: trusty
|
||||||
sudo: required
|
sudo: required
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
- /\d+\.\d+\.\d+$/
|
||||||
before_install:
|
before_install:
|
||||||
- eval "${MATRIX_EVAL}"
|
- eval "${MATRIX_EVAL}"
|
||||||
- ${CXX} --version
|
- ${CXX} --version
|
||||||
|
@ -19,9 +23,17 @@ cache:
|
||||||
install: travis/install_extra_deps.sh
|
install: travis/install_extra_deps.sh
|
||||||
script: travis_wait 30 travis/compile_all.py
|
script: travis_wait 30 travis/compile_all.py
|
||||||
deploy:
|
deploy:
|
||||||
provider: script
|
- provider: script
|
||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
script: travis/deploy.sh
|
script: travis/deploy.sh
|
||||||
|
on:
|
||||||
|
tags: true
|
||||||
|
- provider: script
|
||||||
|
skip_cleanup: true
|
||||||
|
script: travis/deploy.sh
|
||||||
|
on:
|
||||||
|
branch: master
|
||||||
|
condition: $TRAVIS_ENV_TYPE = cron
|
||||||
env:
|
env:
|
||||||
global:
|
global:
|
||||||
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
|
- MATRIX_EVAL="CC=gcc-5 && CXX=g++-5"
|
||||||
|
|
Loading…
Reference in New Issue