diff --git a/.circleci/config.yml b/.circleci/config.yml index 80ca586..c260539 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,7 @@ jobs: working_directory: server command: | ./setup.sh + ./generate.sh ./test.sh -v - run: name: build diff --git a/server/generate.sh b/server/generate.sh new file mode 100755 index 0000000..9c68937 --- /dev/null +++ b/server/generate.sh @@ -0,0 +1,14 @@ +#!/bin/bash -eu + +cd `dirname $0` + +PACKAGE_NAME=github.com/mercari/mtc2018-web/server + +targets=`find . -type f \( -name '*.go' -and -not -iwholename '*vendor*' -and -not -iwholename '*node_modules*' \)` +packages=`go list ${PACKAGE_NAME}/...` + +set -x + +# Apply tools +export PATH=$(pwd)/bin:$PATH +GO111MODULE=off go generate $packages diff --git a/server/test.sh b/server/test.sh index e633d20..6e9c8cf 100755 --- a/server/test.sh +++ b/server/test.sh @@ -9,9 +9,11 @@ packages=`go list ${PACKAGE_NAME}/...` # Apply tools export PATH=$(pwd)/bin:$PATH -GO111MODULE=off go generate $packages goimports -w $targets go tool vet $targets golint -min_confidence 0.6 -set_exit_status $packages go test -race ./... $@ + +# diff check +git diff --quiet