clawbot
89903fa1cd
Closes #39 Splits the Dockerfile into a dedicated lint stage using the `golangci/golangci-lint` image directly, rather than copying the binary into the builder stage. ## Changes ### Dockerfile - **Lint stage** (`AS lint`): Uses the pre-built `golangci/golangci-lint` image (pinned by sha256) to run `make fmt-check` and `make lint`. This is a self-contained stage with its own `go mod download` and source copy. - **Builder stage** (`AS builder`): Runs only `make test` and the final binary build. No longer needs golangci-lint installed. - **Stage dependency**: `COPY --from=lint /src/go.sum /dev/null` forces BuildKit to always execute the lint stage (without this, unused stages are silently skipped). - Both stages touch `mfer/mf.pb.go` to prevent make from trying to regenerate via protoc. With BuildKit, the lint and builder stages run in parallel after their shared `go mod download` layers complete, so lint/formatting failures surface much faster without blocking on test execution. ### Makefile - Added `lint` to the `check` target prereqs: `check: test lint fmt-check` (was `check: test fmt-check`), matching the [REPO_POLICIES](https://git.eeqj.de/sneak/prompts/raw/branch/main/prompts/REPO_POLICIES.md) requirement. Co-authored-by: clawbot <clawbot@noreply.git.eeqj.de> Reviewed-on: #45 Co-authored-by: clawbot <clawbot@noreply.example.org> Co-committed-by: clawbot <clawbot@noreply.example.org>
91 lines
2.3 KiB
Makefile
91 lines
2.3 KiB
Makefile
export DOCKER_BUILDKIT := 1
|
|
export PROGRESS_NO_TRUNC := 1
|
|
GOPATH := $(shell go env GOPATH)
|
|
export PATH := $(PATH):$(GOPATH)/bin
|
|
PROTOC_GEN_GO := $(GOPATH)/bin/protoc-gen-go
|
|
SOURCEFILES := mfer/*.go mfer/*.proto internal/*/*.go cmd/*/*.go go.mod go.sum
|
|
ARCH := $(shell uname -m)
|
|
GITREV_BUILD := $(shell bash $(PWD)/bin/gitrev.sh 2>/dev/null || echo unknown)
|
|
APPNAME := mfer
|
|
VERSION := 0.1.0
|
|
export DOCKER_IMAGE_CACHE_DIR := $(HOME)/Library/Caches/Docker/$(APPNAME)-$(ARCH)
|
|
GOLDFLAGS += -X main.Version=$(VERSION)
|
|
GOLDFLAGS += -X main.Gitrev=$(GITREV_BUILD)
|
|
GOFLAGS := -ldflags "$(GOLDFLAGS)"
|
|
|
|
.PHONY: docker default run ci test check lint fmt fmt-check hooks fixme
|
|
|
|
default: fmt test
|
|
|
|
run: ./bin/mfer
|
|
./$<
|
|
./$< gen
|
|
|
|
ci: test
|
|
|
|
test: $(SOURCEFILES) mfer/mf.pb.go
|
|
go test -v --timeout 10s ./...
|
|
|
|
$(PROTOC_GEN_GO):
|
|
test -e $(PROTOC_GEN_GO) || go install -v google.golang.org/protobuf/cmd/protoc-gen-go@v1.28.1
|
|
|
|
fixme:
|
|
@grep -nir fixme . | grep -v Makefile
|
|
|
|
check: test lint fmt-check
|
|
|
|
fmt-check: mfer/mf.pb.go
|
|
sh -c 'test -z "$$(gofmt -l .)"'
|
|
|
|
hooks:
|
|
echo '#!/bin/sh\nmake check' > .git/hooks/pre-commit
|
|
chmod +x .git/hooks/pre-commit
|
|
|
|
devprereqs:
|
|
which golangci-lint || go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v2.0.2
|
|
|
|
mfer/mf.pb.go: mfer/mf.proto
|
|
cd mfer && go generate .
|
|
|
|
bin/mfer: $(SOURCEFILES) mfer/mf.pb.go
|
|
protoc --version
|
|
cd cmd/mfer && go build -tags urfave_cli_no_docs -o ../../bin/mfer $(GOFLAGS) .
|
|
|
|
clean:
|
|
rm -rfv mfer/*.pb.go bin/mfer cmd/mfer/mfer *.dockerimage
|
|
|
|
fmt: mfer/mf.pb.go
|
|
gofumpt -l -w mfer internal cmd
|
|
golangci-lint run --fix
|
|
-prettier -w *.json
|
|
-prettier -w *.md
|
|
|
|
lint:
|
|
golangci-lint run
|
|
sh -c 'test -z "$$(gofmt -l .)"'
|
|
|
|
docker: sneak-mfer.$(ARCH).tzst.dockerimage
|
|
|
|
sneak-mfer.$(ARCH).tzst.dockerimage: $(SOURCEFILES) vendor.tzst modcache.tzst
|
|
docker build --progress plain --build-arg GITREV=$(GITREV_BUILD) -t sneak/mfer .
|
|
docker save sneak/mfer | pv | zstdmt -19 > $@
|
|
du -sh $@
|
|
|
|
godoc:
|
|
open http://127.0.0.1:6060
|
|
godoc -http=:6060
|
|
|
|
vendor.tzst: go.mod go.sum
|
|
go mod tidy
|
|
go mod vendor
|
|
cd vendor && tar -c . | pv | zstdmt -19 > $(PWD)/$@.tmp
|
|
rm -rf vendor
|
|
mv $@.tmp $@
|
|
|
|
modcache.tzst: go.mod go.sum
|
|
go mod tidy
|
|
cd $(HOME)/go/pkg && chmod -R u+rw . && rm -rf mod sumdb
|
|
go mod download -x
|
|
cd $(shell go env GOMODCACHE) && tar -c . | pv | zstdmt -19 > $(PWD)/$@.tmp
|
|
mv $@.tmp $@
|