build: improve server push automation

Author: xeruf

.dev/githooks/commit-msg

@@ -5,7 +5,7 @@ scopes_file=".dev/scopes.txt"
 test -r $scopes_file &&
   scopes="($(cat "$scopes_file" | sed '/^\(#.*\|\)$/d' | sed ':a;N;s/\n/|/g;ta'))"
 
-head -1 "$1" | grep -Eq "^(fix|feat|docs|style|refactor|test|chore|rework|release|revert)(\(${scopes:-.*}(/.+)?\))?: [A-Za-z]"
+head -1 "$1" | grep -Eq "^(fix|feat|docs|style|refactor|test|build|rework|release|revert)(\(${scopes:-.*}(/.+)?\))?: [A-Za-z]"
 result=$?
 if test $result -ne 0
 then printf "Invalid commit message: '$(head -1 "$1")'

.dev/githooks/prepare-commit-msg

@@ -43,7 +43,7 @@ then
 
     printf "\n\n# Please enter the message in the format\n"
     echo "# <type>(<scope>): <description>"
-    echo "# Possible types: fix, feat, docs, style, refactor, test, chore"
+    echo "# Possible types: fix, feat, docs, style, refactor, test, build"
     test -n "$scopes" && echo "# Allowed scopes: $scopes"
     echo "# For details see https://www.notion.so/softwarechallenge/Git-217333329ea64db5b2cc8bbbaf79db87"
     echo "$original"

.dev/scopes.txt

@@ -5,7 +5,7 @@ contributing
 git
 gradle
 ci
-bundle
+helpers
 
 # Modules
 testclient

helpers/push_to_server.sh

@@ -1,13 +1,18 @@
-#!/bin/sh
+#!/bin/sh -ex
 
 if test -z "$server"; then
     # server is not set or ""
     echo "please call push_staging.sh or push_production.sh"
     exit 1
 fi
+
+if test -S .ssh-socket~
+then ssh -S .ssh-socket~ -O exit $server && sleep 1 || rm .ssh-socket~
+fi
+
 ssh -M -S .ssh-socket~ -fnNT -L 5000:localhost:5000 $server
 ssh -S .ssh-socket~ -O check $server || exit 1
-docker login localhost:5000 || exit 1
+echo testpassword | docker login --username testuser --password-stdin localhost:5000 || exit 1
 
 ./gradlew clean dockerImage
 
@@ -16,8 +21,6 @@ docker push localhost:5000/swc_game-server
 
 ssh -S .ssh-socket~ -O exit $server
 
-# this is currently done in webapp
-#scp docker-compose-production.yml $server:./docker-compose.yml
 ssh $server 'sudo docker pull localhost:5000/swc_game-server' && \
 # NOTE This requires the other services (client-controller and gameserver) in the compose file also already deployed
 ssh $server 'sudo docker service update --image localhost:5000/swc_game-server:latest --with-registry-auth contest_gameserver'