TeaSpeak
/
TeaWeb
1
0
Fork 0
Code Issues 1 Pull Requests Activity

Merge branch 'master' into develop 

# Conflicts:
#	.travis.yml
canary
WolverinDEV 2020-04-09 17:37:50 +02:00
parent b0992cf827 e3bca3fb8d
commit 24f6815513
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -1,4 +1,4 @@
sudo: true sudo: required
dist: trusty dist: trusty
language: node_js language: node_js
@ -12,14 +12,10 @@ 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_dev_server.sh - chmod +x ./scripts/travis_deploy_dev_server.sh
- chmod +x ./scripts/travis_deploy_github.sh - chmod +x ./scripts/travis_deploy_github.sh
branches:
only:
- master
- develop
stages: stages:
- compile - compile
# - test We've no tested defined yet # - test We've no tested defined yet

4
scripts/travis_deploy_github.sh
View File

@ -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)