Updated the travis script to success on all branches and not only on the master one
This commit is contained in:
parent
9274666ba9
commit
e3bca3fb8d
2 changed files with 3 additions and 10 deletions
|
@ -1,4 +1,4 @@
|
||||||
sudo: true
|
sudo: required
|
||||||
dist: trusty
|
dist: trusty
|
||||||
|
|
||||||
language: node_js
|
language: node_js
|
||||||
|
@ -8,19 +8,12 @@ node_js:
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
sudo: required
|
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
# If ever run on windows make sure you don't run this in the git bash!
|
# If ever run on windows make sure you don't run this in the git bash!
|
||||||
- docker run -dit --name emscripten -v "$(pwd)":"/src/" trzeci/emscripten:sdk-incoming-64bit bash
|
- docker run -dit --name emscripten -v "$(pwd)":"/src/" trzeci/emscripten:sdk-incoming-64bit bash
|
||||||
- chmod +x ./scripts/travis.sh
|
- chmod +x ./scripts/travis.sh
|
||||||
- chmod +x ./scripts/travis_deploy.sh
|
- chmod +x ./scripts/travis_deploy.sh
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
- develop
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- "./scripts/travis.sh --enable-release --enable-debug || travis_terminate 1;"
|
- "./scripts/travis.sh --enable-release --enable-debug || travis_terminate 1;"
|
||||||
- "./scripts/travis_deploy.sh || travis_terminate 1;"
|
- "./scripts/travis_deploy.sh || travis_terminate 1;"
|
|
@ -4,8 +4,8 @@ PACKAGES_DIRECTORY="auto-build/packages/"
|
||||||
LOG_FILE="auto-build/logs/build.log"
|
LOG_FILE="auto-build/logs/build.log"
|
||||||
|
|
||||||
if [[ -z "${GIT_AUTHTOKEN}" ]]; then
|
if [[ -z "${GIT_AUTHTOKEN}" ]]; then
|
||||||
echo "Missing environment variable GIT_AUTHTOKEN. Please set it before usign this script!"
|
echo "GIT_AUTHTOKEN isn't set. Don't deploying build!"
|
||||||
exit 1
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
GIT_COMMIT_SHORT=$(git rev-parse --short HEAD)
|
GIT_COMMIT_SHORT=$(git rev-parse --short HEAD)
|
||||||
|
|
Loading…
Add table
Reference in a new issue