Include formatting check to the make test (and thus also check) rule

[strk]

... and give it its own standalone target too (make fmt-check)

\cc @lunny, @tboerger, @bkcsoft

[appleboy]

fmt:
- 	find . -name "*.go" -type f -not -path "./vendor/*" | xargs gofmt -s -w
+ 	find . -name "*.go" -type f -not -path "./vendor/*" | xargs gofmt -d -s -w

display diffs on drone logs.

[strk]

@appleboy I don't understand your comment. This PR is about making drone fail unless the PR code was threated by running make fmt

[bkcsoft]

@appleboy the way I read the docs for gofmt -d and -w would be mutually exclusive. So that wouldn't work either :) and make fmt is there so contributors can easily fix formating :)

-d display diffs instead of rewriting files
-w write result to (source) file instead of stdout

[bkcsoft]

This make it part of make test, not make check as the title says. Change one of them 🙂

[strk]

clarified the title (check is an alias for test)

[appleboy]

@strk I mean that the -d flag show all diff data in logs so the developer can look at it.

[strk]

@appleboy gofmt -d seems indeed useful, but doesn't tell in the exit code if there was or not a diff.
With b2e1367 I removed the --quiet argument to diff so you do get to see the changes, and also I've added messages to give hint about how to fix the problem

[appleboy]

@strk Good work. It is working for me https://github.com/go-training/training/tree/master/example01

LGTM

Don't forget to run make fmt to fix build errors.

[strk]

@bkcsoft please lift your barrier and let this flow ! :)

[strk]

I've just installed Go 1.8 and gofmt from that version also doesn't change any file in this branch. So it looks like 1.7 was bogus or something like that, what do you think @tboerger ?

[strk]

Actually I just tried the make fmt rule with go version go1.7 linux/amd64 and it also didn't change a thing in this branch, so it looks like the difference is elsewhere.

[tboerger]

I don't like such complicated make tasks without a bigger benefit.

[strk]

I don't like the complexity either, so if we cannot ensure any Go version would format the code in the same way, let's forget about it (and beware of the "make fmt" rule too as it might be doing and undoing the same thing)

[sapk]

Any news on that ?
For the difference of format depending of go version, I think we just need to choose one (the simplest should be to choose the one of the drone instance)

[strk]

If I'm not wrong I was using the same version used on Drone, still the format was different, so maybe it's not just version but also architecture ?

[appleboy]

@strk How about the following check script so we can run fmt check with unstaged changes.

GOFILES := find . -name "*.go" -type f -not -path "./vendor/*"
GOFMT ?= gofmt "-s"

.PHONY: fmt-check
fmt-check:
	# get all go files and run go fmt on them
	@files=$$($(GOFILES) | xargs $(GOFMT) -l); if [ -n "$$files" ]; then \
		echo "Please run 'make fmt' and commit the result:"; \
		echo "$${files}"; \
		exit 1; \
		fi;

[strk]

The reason to forbid running with unstaged changes is to avoid changing the tree state. The current `fmt-check` rule does a `checkout .` after the gofmt run, so you're left with what you had before you started. If gofmt -l ensures that, I'm ok with the change. But where are GOFILES and GOFMT defined ? Was your code just an example @appleboy ?

[appleboy]

@strk I updated the previous comment and add missing variables on Makefile.

I can confirm that gofmt -l is working on your scenario with Drone.

[appleboy]

@strk any updates?

[strk]

@appleboy I gave up due to the differences in formatting choices on different machines (mine, and drone's). Do you want to try from your side ? It'd be a pain to be unable to fix a problem reported by Drone because the developers make fmt would produce a different output. I think this is what makes this PR unmergeable...

[strk]

Anyway, rebased for a final review. Running make fmt on my machine results in on changes, and make fmt-check passes here. Let's see if Drone made his mind...

[appleboy]

@strk We should ignore the bindata file. otherwise LGTM

[sapk]

LGTM let merge this if CI don't complain ^^

[appleboy]

https://drone.gitea.io/go-gitea/gitea/3383

@strk Can you fix some format error?

[strk]

@appleboy as I wrote before, make fmt on my machine results in no change. This is with go version go1.7.4 linux/amd64 -- Sorry, but gofmt is failing here :/

[appleboy]

@strk Please rebase the latest code. I just merged #1881 so the CI trigger error.

Try to rebase the latest code and execute make fmt to fix go format error.

[strk]

Ok with the rebase I do have format changed on make fmt, should I commit them too ?

[appleboy]

@strk You are right.

[strk]

So now Drone was happy before my make fmt invocation, this means it'll be probably unhappy now. Contending styles. This is a no-go.

[appleboy]

@strk So let's merge this PR or any concern?

[strk]

Uhm, as it's still happy (and I am too on my side) - let's merge this.
Even if I don't understand how it works ... we'll eventually file a ticket if things go wrong.

[lunny]

@appleboy @strk I think move this to v1.2 and merge it is a good idea.

[appleboy]

@lunny Done. move to 1.2.0