Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
Merge 3055b81 into 51e5b23
Browse files Browse the repository at this point in the history
  • Loading branch information
tamada committed Jul 3, 2019
2 parents 51e5b23 + 3055b81 commit 331036d
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 21 deletions.
9 changes: 7 additions & 2 deletions .travis.yml
@@ -1,11 +1,16 @@
language: go

go:
- '1.11.x'
- '1.12'

env:
global:
secure: "urG/JslIMCq0BVtu4kJWzfX005QxE7Npp7lQ17mn2ZEWs11q/P6ZYM1/YiaXoJMd2mHd6oi2G4Anxq2hZUgPsKFYptva8uwAEMjA3nKhHRSFrR1jwqW2iAJa1mGbl37g8LxbqVxxpNGMpejWLU6AgJ8YB6TiMjb1sl/nSuhiPEazV0uUdjAs416NTTcvHgiZRA/hwRkKaIBKAt2iYbypvGLaK+z/SBnBw2GGCM9UR/K4PzfnhWWNJzK/uC2zJf/2rSkhJyb1A/T3zVxwx2uG9fKqFXh6lp3ZHNGGnGzLAH55yJPE0f0wekyqm9sBHnNGcMKwZOPVi35eE9WKQEBV3k7GX06yPr7RA6/e3TOflxxPYXR65jjpWZ1qmPsgw1dWEVpQDIGWtltarsAHsd9Rvj48nDoJ+gBescErMvrFE773y0Gca36aBPGLpPHd0RO3TR2gT8oS11w+qZPtUbfpkkuG6NFDalOnvcmvKM+fMNKEbHnoLvmD5BBfrni6jmz0NTJ49nDi7rfyzt2IafE3cE2ztoKdH1tBIczsNiwBOt7cAhqS+OyDV0Uuj70tfLAONOyTAZ55MOV+C23DOPHIQVMHQOLgaaVxjRpJMmBX+zrfPq4VAl6+2ZTUXhLofF2Rg8R4DlUeQrQPFyEi5vB6l12usnsnOed+zyeSnLe5HQ8="
- GO111MODULE=on
- secure: "urG/JslIMCq0BVtu4kJWzfX005QxE7Npp7lQ17mn2ZEWs11q/P6ZYM1/YiaXoJMd2mHd6oi2G4Anxq2hZUgPsKFYptva8uwAEMjA3nKhHRSFrR1jwqW2iAJa1mGbl37g8LxbqVxxpNGMpejWLU6AgJ8YB6TiMjb1sl/nSuhiPEazV0uUdjAs416NTTcvHgiZRA/hwRkKaIBKAt2iYbypvGLaK+z/SBnBw2GGCM9UR/K4PzfnhWWNJzK/uC2zJf/2rSkhJyb1A/T3zVxwx2uG9fKqFXh6lp3ZHNGGnGzLAH55yJPE0f0wekyqm9sBHnNGcMKwZOPVi35eE9WKQEBV3k7GX06yPr7RA6/e3TOflxxPYXR65jjpWZ1qmPsgw1dWEVpQDIGWtltarsAHsd9Rvj48nDoJ+gBescErMvrFE773y0Gca36aBPGLpPHd0RO3TR2gT8oS11w+qZPtUbfpkkuG6NFDalOnvcmvKM+fMNKEbHnoLvmD5BBfrni6jmz0NTJ49nDi7rfyzt2IafE3cE2ztoKdH1tBIczsNiwBOt7cAhqS+OyDV0Uuj70tfLAONOyTAZ55MOV+C23DOPHIQVMHQOLgaaVxjRpJMmBX+zrfPq4VAl6+2ZTUXhLofF2Rg8R4DlUeQrQPFyEi5vB6l12usnsnOed+zyeSnLe5HQ8="

before_script:
- go get github.com/mattn/goveralls

script:
- make test build
- $GOPATH/bin/goveralls -repotoken=$COVERALLS_TOKEN -coverprofile=coverage.out -service=travis-ci
19 changes: 3 additions & 16 deletions Makefile
@@ -1,23 +1,10 @@
GO=go
NAME := uniq2
VERSION := 1.0.0
REVISION := $(shell git rev-parse --short HEAD)
LDFLAGS := -X 'main.version=$(VERSION)'
-X 'main.revision=$(REVISION)'
VERSION := 1.0.1

all: test build

deps:
$(GO) get golang.org/x/lint/golint
$(GO) get golang.org/x/tools/cmd/goimports
$(GO) get github.com/golang/dep/cmd/dep

$(GO) get golang.org/x/tools/cmd/cover
$(GO) get github.com/mattn/goveralls

dep ensure -vendor-only

setup: deps update_version
setup: update_version
git submodule update --init

update_version:
Expand All @@ -36,4 +23,4 @@ build: setup

clean:
$(GO) clean
rm -rf $(NAME)
rm -rf cmd/uniq2/$(NAME)
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@
[![codebeat badge](https://codebeat.co/badges/855266ea-99d4-4d80-ac43-81a1712f0f90)](https://codebeat.co/projects/github-com-tamada-uniq2-master)
[![Go Report Card](https://goreportcard.com/badge/github.com/tamada/uniq2)](https://goreportcard.com/report/github.com/tamada/uniq2)
[![License](https://img.shields.io/badge/License-WTFPL-blue.svg)](https://github.com/tamada/uniq2/blob/master/LICENSE)
[![Version](https://img.shields.io/badge/Version-1.0.0-yellowgreen.svg)](https://github.com/tamada/uniq2/releases/tag/v1.0.0)
[![Version](https://img.shields.io/badge/Version-1.0.1-yellowgreen.svg)](https://github.com/tamada/uniq2/releases/tag/v1.0.1)

# uniq2

Expand Down
2 changes: 1 addition & 1 deletion cmd/uniq2/main.go
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/tamada/uniq2/lib"
)

const VERSION = "1.0.0"
const VERSION = "1.0.1"

func printHelp(appName string) {
fmt.Printf(`%s [OPTIONS] [INPUT [OUTPUT]]
Expand Down
2 changes: 1 addition & 1 deletion docs/content/_index.md
Expand Up @@ -7,7 +7,7 @@ title: uniq2
[![codebeat badge](https://codebeat.co/badges/855266ea-99d4-4d80-ac43-81a1712f0f90)](https://codebeat.co/projects/github-com-tamada-uniq2-master)
[![Go Report Card](https://goreportcard.com/badge/github.com/tamada/uniq2)](https://goreportcard.com/report/github.com/tamada/uniq2)
[![License](https://img.shields.io/badge/License-WTFPL-blue.svg)](https://github.com/tamada/uniq2/blob/master/LICENSE)
[![Version](https://img.shields.io/badge/Version-1.0.0-yellowgreen.svg)](https://github.com/tamada/uniq2/releases/tag/v1.0.0)
[![Version](https://img.shields.io/badge/Version-1.0.1-yellowgreen.svg)](https://github.com/tamada/uniq2/releases/tag/v1.0.1)

## Description

Expand Down
20 changes: 20 additions & 0 deletions go.mod
@@ -0,0 +1,20 @@
module github.com/tamada/uniq2

go 1.12

require (
github.com/Masterminds/semver v1.4.2 // indirect
github.com/Masterminds/vcs v1.13.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/boltdb/bolt v1.3.1 // indirect
github.com/golang/dep v0.5.4 // indirect
github.com/golang/protobuf v1.3.1 // indirect
github.com/jmank88/nuts v0.3.0 // indirect
github.com/nightlyone/lockfile v0.0.0-20180618180623-0ad87eef1443 // indirect
github.com/ogier/pflag v0.0.1
github.com/pelletier/go-toml v1.4.0 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/sdboyer/constext v0.0.0-20170321163424-836a14457353 // indirect
golang.org/x/lint v0.0.0-20190409202823-959b441ac422 // indirect
golang.org/x/tools v0.0.0-20190702201734-44aeb8b7c377 // indirect
)
43 changes: 43 additions & 0 deletions go.sum
@@ -0,0 +1,43 @@
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
github.com/Masterminds/vcs v1.13.0 h1:USF5TvZGYgIpcbNAEMLfFhHqP08tFZVlUVrmTSpqnyA=
github.com/Masterminds/vcs v1.13.0/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/dep v0.5.4 h1:WfV5qbGwsBNUDhk+pfI6emWm7SdDFsnSWkqCMNG3BRs=
github.com/golang/dep v0.5.4/go.mod h1:6RZ2Wai7dSWk7qL55sDYk+8UPFqcW7all2KDBraPPFA=
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/jmank88/nuts v0.3.0 h1:UZUboV1LXVkBUTHLRTEZrDfAL7QYgj9jEsBCiJHrxEM=
github.com/jmank88/nuts v0.3.0/go.mod h1:kTf5cyoLibZUQg9Lns/gteKO1d/5XrhacD1QVKviAKk=
github.com/nightlyone/lockfile v0.0.0-20180618180623-0ad87eef1443 h1:+2OJrU8cmOstEoh0uQvYemRGVH1O6xtO2oANUWHFnP0=
github.com/nightlyone/lockfile v0.0.0-20180618180623-0ad87eef1443/go.mod h1:JbxfV1Iifij2yhRjXai0oFrbpxszXHRx1E5RuM26o4Y=
github.com/ogier/pflag v0.0.1 h1:RW6JSWSu/RkSatfcLtogGfFgpim5p7ARQ10ECk5O750=
github.com/ogier/pflag v0.0.1/go.mod h1:zkFki7tvTa0tafRvTBIZTvzYyAu6kQhPZFnshFFPE+g=
github.com/pelletier/go-toml v1.4.0 h1:u3Z1r+oOXJIkxqw34zVhyPgjBsm6X2wn21NWs/HfSeg=
github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/sdboyer/constext v0.0.0-20170321163424-836a14457353 h1:tnWWLf0nI2TI62Wd/ZOea4XYqE+y1sf2pdm+VItsc0c=
github.com/sdboyer/constext v0.0.0-20170321163424-836a14457353/go.mod h1:5HStXbIikwtDAgAIqiQIqVgMn7mlvZa6PTpwiAVYGYg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190702201734-44aeb8b7c377 h1:P/0pu7r+pn3Fkv7pyRpb7tBawImpURm2mTIbR6MadCc=
golang.org/x/tools v0.0.0-20190702201734-44aeb8b7c377/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

0 comments on commit 331036d

Please sign in to comment.