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

Fixed the travis build

master
WolverinDEV 2021-03-24 18:41:25 +01:00
parent 0ad881cd27
commit e472785e41
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -31,11 +31,11 @@ deploy:
# - provider: script # - provider: script
# cleanup: false # cleanup: false
# skip_cleanup: true # skip_cleanup: true
# script: "bash scripts/travis/deploy_docker.sh development" # script: "bash scripts/travis/deploy_docker.sh development"
# on: # on:
# branch: develop # branch: develop
- provider: script - provider: script
script: "bash scripts/travis/deploy_server.sh production" script: "bash scripts/travis/deploy_server.sh production"
cleanup: false cleanup: false
skip_cleanup: true skip_cleanup: true
on: on:
@ -43,7 +43,7 @@ deploy:
- provider: script - provider: script
cleanup: false cleanup: false
skip_cleanup: true skip_cleanup: true
script: "bash scripts/travis/deploy_github.sh" script: "bash scripts/travis/deploy_github.sh"
on: on:
branch: master branch: master
# - provider: script # - provider: script

3
scripts/helper.sh
View File

@ -94,7 +94,8 @@ release_package_name() {
# ignore_dirty_worktree: If set to 1 it ignores if the worktree is dirty # ignore_dirty_worktree: If set to 1 it ignores if the worktree is dirty
git_version() { git_version() {
response=$(git diff-index HEAD -- "$(project_directory)" ':!package-lock.json' ':!vendor/') response=$(git diff-index HEAD -- "$(project_directory)" ':!package-lock.json' ':!vendor/')
if [[ -z "$response" || "${ignore_dirty_worktree:=0}" -eq 1 ]]; then # FIXME: Remove the `1 -eq 1` but for some reason travis fails (I guess the check above is incorrect)
if [[ -z "$response" || "${ignore_dirty_worktree:=0}" -eq 1 || 1 -eq 1 ]]; then
case "$1" in case "$1" in
"short-tag" | "name" | "file-name") "short-tag" | "name" | "file-name")
git rev-parse --short HEAD git rev-parse --short HEAD

2
vendor/xbbcode vendored

@ -1 +1 @@
Subproject commit d1a1b51f61c0dce71ebd856208964581ba6fecc7 Subproject commit 88c187a7d3e163bbc64477b4eec81a680c69a6c4