Add a fmt build target and make use of a go build cache.
#1558
Conversation
Signed-off-by: Ian Campbell <ijc@docker.com>
Codecov Report
@@ Coverage Diff @@
## master #1558 +/- ##
==========================================
- Coverage 55.24% 55.23% -0.02%
==========================================
Files 289 289
Lines 19381 19391 +10
==========================================
+ Hits 10707 10710 +3
- Misses 7978 7984 +6
- Partials 696 697 +1 |
|
I'm not sure about the |
|
The main benefit of the |
With a docker build cache already primed with the build image I am seeing `time make build -f docker.Makefile DOCKER_BUILDKIT=1 GO_BUILD_CACHE=n` takes more than 1 minute. By contrast `time make build -f docker.Makefile DOCKER_BUILDKIT=1 GO_BUILD_CACHE=y` takes less than 10s with a hot cache irrespective of whether the source tree has changed Signed-off-by: Ian Campbell <ijc@docker.com>
|
Is this mergeable @thaJeztah @silvin-lubecki or are there other changes you'd like to see? |
| @@ -21,6 +21,10 @@ test: test-unit ## run tests | |||
| test-coverage: ## run test coverage | |||
| ./scripts/test/unit-with-coverage $(shell go list ./... | grep -vE '/vendor/|/e2e/') | |||
|
|
|||
| .PHONY: fmt | |||
| fmt: | |||
| go list -f {{.Dir}} ./... | xargs gofmt -w -s -d | |||
There was a problem hiding this comment.
oh, actually; do we need to exclude vendor here?
There was a problem hiding this comment.
Not according to my testing when I wrote it:
$ go list -f {{.Dir}} ./... | grep vendor
$There was a problem hiding this comment.
Interesting; wonder why it's needed in the other parts of the Makefile then 🤔. Maybe if they're running from inside a different directory
There was a problem hiding this comment.
I believe it wasn't always the case with older versions of the go tooling. I suspect the two places which grep the vendor dir out are just out of date, but they both also want to exclude e2e so there isn't a whole lot of worthwhile cleanup to be done.
A couple of (unrelated) tweaks to the build.
Firstly add a
make -f dockerfile.Makefile fmttarget which runsgofmton all the non-vendored Go code as a developer convenience.Secondly add (optional, but defaulted on) support for using a go build cache when using the
dockerfile.Makefiletargets. This speeds up repeated builds for me by 6x (over 1m to less than 10s), according totime make build -f docker.Makefile DOCKER_BUILDKIT=1 GO_BUILD_CACHE=y(or =n).