Merge branch 'master' into discord

This commit is contained in:
Chris Sexton 2020-10-09 10:45:14 -04:00 committed by GitHub
commit 9d33bbd675
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

3
.gitignore vendored
View File

@ -67,10 +67,9 @@ Temporary Items
util/*/files util/*/files
util/*/files util/*/files
run.sh
.idea .idea
logs logs
util/files util/files
impact.ttf
gus.sh gus.sh
rathaus.sh rathaus.sh
run.sh

3
gok.sh
View File

@ -15,7 +15,8 @@ gofmt -l $(find . -name '*.go') > $o 2>&1
test $(wc -l $o | awk '{ print $1 }') = "0" || fail test $(wc -l $o | awk '{ print $1 }') = "0" || fail
echo govet echo govet
go vet ./... > $o 2>&1 || fail #go vet ./... > $o 2>&1
echo disabled
echo go test echo go test
go test -test.timeout=60s ./... > $o 2>&1 || fail go test -test.timeout=60s ./... > $o 2>&1 || fail