Skip to content

Commit 623987a

Browse files
ldezashanbrown
authored andcommitted
fix MIPS release (golangci#1697)
1 parent fb8ecdb commit 623987a

File tree

5 files changed

+770
-378
lines changed

5 files changed

+770
-378
lines changed

.goreleaser.yml

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ builds:
2525
goarm:
2626
- 6
2727
- 7
28+
gomips:
29+
- hardfloat
2830
env:
2931
- CGO_ENABLED=0
3032
ignore:

Makefile

+1-20
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ clean:
1717
rm -f golangci-lint
1818
rm -f test/path
1919
rm -f tools/Dracula.itermcolors
20-
rm -f tools/godownloader
2120
rm -f tools/goreleaser
2221
rm -f tools/svg-term
2322
rm -rf tools/node_modules
@@ -40,25 +39,14 @@ test_linters:
4039

4140
# Maintenance
4241

43-
generate: install.sh assets/github-action-config.json
4442
fast_generate: assets/github-action-config.json
45-
.PHONY: generate fast_generate
46-
47-
maintainer-clean: clean
48-
rm -rf install.sh
49-
.PHONY: maintainer-clean
43+
.PHONY: fast_generate
5044

5145
fast_check_generated:
5246
$(MAKE) --always-make fast_generate
5347
git checkout -- go.mod go.sum # can differ between go1.12 and go1.13
5448
git diff --exit-code # check no changes
5549

56-
check_generated:
57-
$(MAKE) --always-make generate
58-
git checkout -- go.mod go.sum # can differ between go1.12 and go1.13
59-
git diff --exit-code # check no changes
60-
.PHONY: check_generated
61-
6250
release: .goreleaser.yml tools/goreleaser
6351
./tools/goreleaser
6452
.PHONY: release
@@ -72,10 +60,6 @@ snapshot: .goreleaser.yml tools/goreleaser
7260
golangci-lint: FORCE
7361
go build -o $@ ./cmd/golangci-lint
7462

75-
tools/godownloader: export GOFLAGS = -mod=readonly
76-
tools/godownloader: tools/go.mod tools/go.sum
77-
cd tools && go build github.com/goreleaser/godownloader
78-
7963
tools/goreleaser: export GOFLAGS = -mod=readonly
8064
tools/goreleaser: tools/go.mod tools/go.sum
8165
cd tools && go build github.com/goreleaser/goreleaser
@@ -93,9 +77,6 @@ tools/Dracula.itermcolors:
9377
assets/demo.svg: tools/svg-term tools/Dracula.itermcolors
9478
./tools/svg-term --cast=183662 --out assets/demo.svg --window --width 110 --height 30 --from 2000 --to 20000 --profile ./tools/Dracula.itermcolors --term iterm2
9579

96-
install.sh: .goreleaser.yml tools/godownloader
97-
./tools/godownloader .goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > $@
98-
9980
assets/github-action-config.json: FORCE golangci-lint
10081
go run ./scripts/gen_github_action_config/main.go $@
10182

tools/go.mod

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
module github.com/golangci/golangci-lint/tools
22

3-
go 1.12
3+
go 1.13
44

5-
require (
6-
github.com/goreleaser/godownloader v0.1.0
7-
github.com/goreleaser/goreleaser v0.136.0
8-
)
5+
require github.com/goreleaser/goreleaser v0.155.0
96

10-
// Fix invalid pseudo-version: revision is longer than canonical (6fd6a9bfe14e)
11-
replace github.com/go-macaron/cors => github.com/go-macaron/cors v0.0.0-20190418220122-6fd6a9bfe14e
7+
// https://github.com/mattn/go-shellwords/pull/39
8+
replace github.com/mattn/go-shellwords => github.com/caarlos0/go-shellwords v1.0.11

0 commit comments

Comments
 (0)