Skip to content

Commit 3e9c2d8

Browse files
committed
Simplify some old build cruft
Things are a lot easier nowadays!
1 parent bdbc487 commit 3e9c2d8

File tree

3 files changed

+2
-28
lines changed

3 files changed

+2
-28
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Please note that this project is released with a [Contributor Code of Conduct][c
2020

2121
Here are a few things you can do that will increase the likelihood of your pull request being accepted:
2222

23-
- Make sure that your code is formatted correctly: `make gofmt`.
23+
- Make sure that your code is formatted correctly according to `go fmt`: `go fmt .`.
2424
- Write tests.
2525
- Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
2626
- Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).

Makefile

-26
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ GO111MODULES := 1
33
export GO111MODULES
44

55
GO := $(CURDIR)/script/go
6-
GOFMT := $(CURDIR)/script/gofmt
76

87
GO_LDFLAGS := -X main.BuildVersion=$(shell git describe --tags --always --dirty || echo unknown)
98
GOFLAGS := -ldflags "$(GO_LDFLAGS)"
@@ -12,14 +11,6 @@ ifdef USE_ISATTY
1211
GOFLAGS := $(GOFLAGS) --tags isatty
1312
endif
1413

15-
GO_SRCS := $(sort $(shell $(GO) list -f ' \
16-
{{$$ip := .Dir}} \
17-
{{range .GoFiles }}{{printf "%s/%s\n" $$ip .}}{{end}} \
18-
{{range .CgoFiles }}{{printf "%s/%s\n" $$ip .}}{{end}} \
19-
{{range .TestGoFiles }}{{printf "%s/%s\n" $$ip .}}{{end}} \
20-
{{range .XTestGoFiles}}{{printf "%s/%s\n" $$ip .}}{{end}} \
21-
' ./...))
22-
2314
.PHONY: all
2415
all: bin/git-sizer
2516

@@ -85,23 +76,6 @@ test: bin/git-sizer gotest
8576
gotest:
8677
$(GO) test -timeout 60s $(GOFLAGS) ./...
8778

88-
.PHONY: gofmt
89-
gofmt:
90-
$(GOFMT) -l -w $(GO_SRCS) | sed -e 's/^/Fixing /'
91-
92-
.PHONY: goimports
93-
goimports:
94-
goimports -l -w -e $(GO_SRCS)
95-
96-
.PHONY: govet
97-
govet:
98-
$(GO) vet ./...
99-
10079
.PHONY: clean
10180
clean:
10281
rm -rf bin
103-
104-
# List all of this project's Go sources:
105-
.PHONY: srcs
106-
srcs:
107-
@printf "%s\n" $(GO_SRCS)

docs/BUILDING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ This procedure is intended for experts and people who want to help develop `git-
2525
git clone https://github.com/github/git-sizer.git
2626
cd git-sizer
2727

28-
2. Install Go if necessary and create and prepare a project-local `GOPATH`:
28+
2. Install Go if necessary:
2929

3030
script/bootstrap
3131

0 commit comments

Comments
 (0)