Improve CI

Author: nhooyr

.github/fmt/entrypoint.sh

@@ -1,15 +1,30 @@
 #!/usr/bin/env bash
 
-source .github/lib.sh
+source .github/lib.sh || exit 1
 
-gofmt -w -s .
-go run go.coder.com/go-tools/cmd/goimports -w "-local=$(go list -m)" .
-go run mvdan.cc/sh/cmd/shfmt -w -s -sr .
+gen() {
+	# Unfortunately, this is the only way to ensure go.mod and go.sum are correct.
+	# See https://github.com/golang/go/issues/27005
+	go list ./... > /dev/null
+	go mod tidy
 
-if [[ $CI ]] && unstaged_files; then
+	go install github.com/golang/protobuf/protoc-gen-go
+	go generate ./...
+}
+
+fmt() {
+	gofmt -w -s .
+	go run go.coder.com/go-tools/cmd/goimports -w "-local=$(go list -m)" .
+	go run mvdan.cc/sh/cmd/shfmt -w -s -sr .
+}
+
+gen
+fmt
+
+if [[ $CI && $(unstaged_files) != "" ]]; then
 	set +x
 	echo
-	echo "files are not formatted correctly"
+	echo "files either need generation or are formatted incorrectly"
 	echo "please run:"
 	echo "./test.sh"
 	echo

.github/lib.sh

@@ -7,13 +7,12 @@ export PAGER=cat
 
 # shellcheck disable=SC2034
 # CI is used by the scripts that source this file.
-CI=${GITHUB_ACTION-}
+export CI=${GITHUB_ACTION-}
 
 if [[ $CI ]]; then
 	export GOFLAGS=-mod=readonly
 fi
 
-function unstaged_files() {
-	[[ $(git ls-files --other --modified --exclude-standard) != "" ]]
+unstaged_files() {
+	git ls-files --other --modified --exclude-standard
 }
-

.github/lint/Dockerfile

@@ -0,0 +1,10 @@
+FROM codercom/playcicache
+
+LABEL "com.github.actions.name"="lint"
+LABEL "com.github.actions.description"="lint"
+LABEL "com.github.actions.icon"="code"
+LABEL "com.github.actions.color"="purple"
+
+COPY entrypoint.sh /entrypoint.sh
+
+CMD ["/entrypoint.sh"]

.github/lint/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+source .github/lib.sh || exit 1
+
+(
+	shopt -s globstar nullglob dotglob
+	shellcheck ./**/*.sh
+)
+
+go vet -composites=false ./...
+go run golang.org/x/lint/golint -set_exit_status ./...

.github/test/entrypoint.sh

@@ -1,39 +1,17 @@
 #!/usr/bin/env bash
 
-source .github/lib.sh
-
-# Unfortunately, this is the only way to ensure go.mod and go.sum are correct.
-# See https://github.com/golang/go/issues/27005
-go list ./... > /dev/null
-go mod tidy
-
-go install golang.org/x/tools/cmd/stringer
-go generate ./...
-
-if [[ $CI ]] && unstaged_files; then
-	set +x
-	echo
-	echo "generated code needs an update"
-	echo "please run:"
-	echo "./test.sh"
-	echo
-	git status
-	exit 1
-fi
-
-(
-	shopt -s globstar nullglob dotglob
-	shellcheck ./**/*.sh
-)
-
-go vet -composites=false ./...
+source .github/lib.sh || exit 1
 
 COVERAGE_PROFILE=$(mktemp)
 go test -race -v "-coverprofile=${COVERAGE_PROFILE}" -vet=off ./...
 go tool cover "-func=${COVERAGE_PROFILE}"
 
 if [[ $CI ]]; then
-	bash <(curl -s https://codecov.io/bash)
+	bash <(curl -s https://codecov.io/bash) -f "$COVERAGE_PROFILE"
 else
 	go tool cover "-html=${COVERAGE_PROFILE}" -o=coverage.html
+
+	set +x
+	echo
+	echo "please open coverage.html to see detailed test coverage stats"
 fi

test.sh

@@ -1,20 +1,27 @@
 #!/usr/bin/env bash
 
-# This is for local testing. See .github for CI.
+# This script is for local testing. See .github for CI.
 
-source ./.github/lib.sh
+source .github/lib.sh || exit 1
+cd "$(dirname "${0}")"
 
 function docker_run() {
-	local dir=$1
+	local DIR="$1"
+	local IMAGE
+	IMAGE="$(docker build -q "$DIR")"
 	docker run \
 		-v "${PWD}:/repo" \
 		-v "$(go env GOPATH):/go" \
 		-v "$(go env GOCACHE):/root/.cache/go-build" \
 		-w /repo \
-		"$(docker build -q "$dir")"
+		"${IMAGE}"
 }
+
+if [[ $# -gt 0 ]]; then
+	docker_run ".github/$*"
+	exit 0
+fi
+
 docker_run .github/fmt
+docker_run .github/lint
 docker_run .github/test
-
-set +x
-echo "please open coverage.html to see detailed test coverage stats"