Merge branch 'master' into fix/cancelrequest

Author: xeruf

.dev/githooks/commit-msg

@@ -5,13 +5,13 @@ scopes_file=".dev/scopes.txt"
 
 scopes="("
 cat "$scopes_file" | while read a;
-do scopes="$scopes$a|";
+do test -z "$a" || [[ "$a" == \#* ]] || scopes+="$a|";
 done;
 scopes="${scopes%\|})"
 
-cat "$1" | grep -Eq "(fix|feat|docs|style|refactor|test|chore|rework|release)(\($scopes\))?: [a-z]"
+cat "$1" | grep -Eq "(fix|feat|docs|style|refactor|test|chore|rework|release)(\($scopes\))?: [0-9a-z]"
 result=$?
 if test $result -ne 0
-then echo "Please check that the commit message adheres to the guidelines at http://karma-runner.github.io/4.0/dev/git-commit-msg.html and matches the scopes defined in .dev/scopes.txt"
+then echo "Please check that the commit message adheres to the guidelines at http://karma-runner.github.io/latest/dev/git-commit-msg.html and the scope is one of $scopes as defined in $scopes_file"
 fi
 exit $result

.dev/githooks/prepare-commit-msg

@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# This hook adds a comment for guidance about the commit message
+# format on top of the default commit message.
+#
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, set the hooksPath in git:
+# git config core.hooksPath .dev/githooks
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+beginswith() { case $2 in "$1"*) true;; *) false;; esac; }
+
+original=$(cat "$COMMIT_MSG_FILE")
+if beginswith $'\n#' "$original"; 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, rework, release"
+        printf "# For details see https://www.notion.so/softwarechallenge/Git-217333329ea64db5b2cc8bbbaf79db87" >> "$COMMIT_MSG_FILE"
+        echo "$original"
+    } > "$COMMIT_MSG_FILE"
+fi

.dev/scopes.txt

@@ -2,11 +2,15 @@ readme
 git
 gradle
 travis
+
+# Modules
+testclient
 player
+server
+
 plugin
 gamerules
-server
+
 sdk
 framework
 protocol
-testclient

.github/workflows/gradle.yml

@@ -0,0 +1,46 @@
+on: [push, pull_request, create]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'recursive'
+    - name: Set up JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Execute tests
+      run: ./gradlew check || (exitcode=$?; find build/tests -name '*.log' -type f | while read f; do echo -e "\033[4m$f\033[0m"; cat $f; done && return $exitcode)
+    - name: Build deployment artifacts
+      run: ./gradlew deploy
+    - name: Upload jars as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: software-challenge-backend-${{ github.sha }}
+        path: |
+          build/deploy/*.zip
+          build/deploy/*.jar
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+    - uses: actions/download-artifact@v2
+      with:
+        name: software-challenge-backend-${{ github.sha }}
+        path: artifacts
+    - name: Release ${{ github.ref }}
+      uses: softprops/action-gh-release@v1
+      with:
+        files: artifacts/*
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,43 +1,12 @@
+# Build artifacts
 build/
-deploy/
-bin/
-doc/
-log/
 out/
 .gradle/
-.kotlintest/
-
-# Copied files
-/server/configuration/server.properties
-/server/plugins
-/server/lib/
-/socha-sdk/lib/socha-sdk\.jar
-/players/**/lib/
-/plugins/**/lib/
-/helpers/test-client/lib/
-
-# Eclipse Project files
-.project
-.metadata
-.classpath
-*.recommenders
 
 # IntelliJ project files
 .idea/*
 !.idea/codeStyles/
 *.iml
 
-# Latex artifacts
-*.dvi
-*.aux
-*.idx
-*.toc
-*.out
-*.log
-
-# VSCode configuration files
-.vscode
-# RVM Project Config
-.rvmrc
-
-!gradle.properties
+logs/
+log/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule ".idea"]
+	path = .idea
+	url = https://github.com/CAU-Kiel-Tech-Inf/idea-config.git