From e3bca3fb8d2d6c5f6bc61d3de1c8e08cd83d1af3 Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Wed, 8 Apr 2020 12:46:13 +0200 Subject: [PATCH] Updated the travis script to success on all branches and not only on the master one --- .travis.yml | 9 +-------- scripts/travis_deploy.sh | 4 ++-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c9ce335..a7550635 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -sudo: true +sudo: required dist: trusty language: node_js @@ -8,19 +8,12 @@ node_js: services: - docker -sudo: required - before_install: # 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 - chmod +x ./scripts/travis.sh - chmod +x ./scripts/travis_deploy.sh -branches: - only: - - master - - develop - script: - "./scripts/travis.sh --enable-release --enable-debug || travis_terminate 1;" - "./scripts/travis_deploy.sh || travis_terminate 1;" \ No newline at end of file diff --git a/scripts/travis_deploy.sh b/scripts/travis_deploy.sh index 168f284a..16225dd3 100644 --- a/scripts/travis_deploy.sh +++ b/scripts/travis_deploy.sh @@ -4,8 +4,8 @@ PACKAGES_DIRECTORY="auto-build/packages/" LOG_FILE="auto-build/logs/build.log" if [[ -z "${GIT_AUTHTOKEN}" ]]; then - echo "Missing environment variable GIT_AUTHTOKEN. Please set it before usign this script!" - exit 1 + echo "GIT_AUTHTOKEN isn't set. Don't deploying build!" + exit 0 fi GIT_COMMIT_SHORT=$(git rev-parse --short HEAD)