Merge origin/ci into ci

This commit is contained in:
paolo
2016-04-27 16:32:40 +02:00
2 changed files with 4 additions and 5 deletions
+2
View File
@@ -49,6 +49,8 @@ echo "Starting..."
cwd=$(pwd)
echo "Database ..."
pkill -f fhctest &
sudo -u postgres psql fhctest -c 'DROP DATABASE IF EXISTS fhctest;'
sudo -u postgres createdb -O fhcomplete fhctest
echo "Installing FH-Complete..."
+2 -5
View File
@@ -11,16 +11,14 @@ build_settings:
user: 'fhcomplete'
pass: 'fhcomplete'
setup:
# shell:
# - "pkill -f fhctest &"
composer:
directory: ""
action: "install"
# pgsql:
# - "DROP DATABASE IF EXISTS fhctest;"
shell:
- "pkill -f fhctest &"
- "sudo -u postgres psql fhctest -c 'DROP DATABASE IF EXISTS fhctest;'"
# - "pkill -f fhctest &"
# - "sudo -u postgres psql fhctest -c 'DROP DATABASE IF EXISTS fhctest;'"
- "cd %BUILD_PATH% && chmod u+x install.sh && ./install.sh fhctest" # Install Database
- "rm -f /var/www/html/build" # SymLink löschen falls vorhanden
- "ln -s %BUILD_PATH% /var/www/html/build" # SymLink to the actual build
@@ -54,7 +52,6 @@ complete:
# - "fhcomplete@darkness.su"
# - "nk@jabber.at"
# - "tschux@jabber.org"
# - "lexdesign@blah.im"
# - "tschux@jabber.at"
# server: "jabber.blah.im"
# tls: 1