Skip to content

Commit

Permalink
Merge pull request #24 from Songmu/update-deps
Browse files Browse the repository at this point in the history
Update deps
  • Loading branch information
Songmu authored Feb 10, 2019
2 parents fed615a + b578d3c commit 9367bbd
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.9
- tip
script:
- make lint
- make test
Expand Down
4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
branch = "master"
name = "github.com/kballard/go-shellquote"

[[constraint]]
branch = "master"
name = "github.com/lestrrat-go/strftime"

[[constraint]]
branch = "master"
name = "golang.org/x/sync"
Expand Down
33 changes: 19 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
VERSION = $(shell gobump show -r)
CURRENT_REVISION = $(shell git rev-parse --short HEAD)
BUILD_LDFLAGS = "-X github.com/Songmu/horenso.revision=$(CURRENT_REVISION)"
BUILD_LDFLAGS = "-s -w -X github.com/Songmu/horenso.revision=$(CURRENT_REVISION)"
ifdef update
u=-u
endif
Expand All @@ -9,12 +10,12 @@ deps:
dep ensure

devel-deps: deps
go get ${u} golang.org/x/lint/golint
go get ${u} github.com/mattn/goveralls
go get ${u} github.com/motemen/gobump
go get ${u} github.com/laher/goxc
go get ${u} github.com/Songmu/ghch
go get ${u} github.com/tcnksm/ghr
go get ${u} golang.org/x/lint/golint \
github.com/mattn/goveralls \
github.com/motemen/gobump \
github.com/Songmu/goxz/cmd/goxz \
github.com/Songmu/ghch/cmd/ghch \
github.com/tcnksm/ghr

test: deps
go test
Expand All @@ -29,13 +30,17 @@ cover: devel-deps
build: deps
go build -ldflags=$(BUILD_LDFLAGS) ./cmd/horenso

bump: devel-deps
_tools/releng

crossbuild: devel-deps
goxc -pv=v$(shell gobump show -r) -build-ldflags=$(BUILD_LDFLAGS) \
-os=linux,darwin,freebsd -arch=386,amd64 -d=./dist \
-tasks=clean-destination,xc,archive,rmbin
goxz -pv=v$(VERSION) -build-ldflags=$(BUILD_LDFLAGS) \
-os=linux,darwin,freebsd -arch=386,amd64 \
-d=./dist/v$(VERSION) ./cmd/horenso

release: devel-deps
_tools/releng
_tools/upload_artifacts
upload:
ghr v$(VERSION) dist/v$(VERSION)

release: bump crossbuild upload

.PHONY: deps devel-deps test lint cover build crossbuild release
.PHONY: deps devel-deps test lint cover build bump crossbuild upload release
6 changes: 0 additions & 6 deletions _tools/upload_artifacts

This file was deleted.

0 comments on commit 9367bbd

Please sign in to comment.