Skip to content

Commit

Permalink
Merge pull request #19 from goldeneggg/fix_makefile_for_travis_check
Browse files Browse the repository at this point in the history
Fix makefile for travis check and bump up aws-sdk-go
  • Loading branch information
goldeneggg authored May 5, 2019
2 parents 428ad9d + 191f87c commit 2423430
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 9 deletions.
22 changes: 19 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
NAME := lsec2
SRCS := $(shell find . -type f -name '*.go' | \grep -v 'vendor')
PACKAGES := $(shell ./scripts/_packages.sh)
PROF_DIR := ./.profile
GOVERSION := $(shell go version | awk '{print $$3;}')
AWS_SDK_GO_PKG := github.com/aws/aws-sdk-go

# Note: NOT use lazy initializer because make is unstable.
#SRCS = $(eval SRCS := $(shell find . -type f -name '*.go' | \grep -v 'vendor'))$(SRCS)
#PACKAGES = $(eval PACKAGES := $(shell ./scripts/_packages.sh))$(PACKAGES)
#GOVERSION = $(eval GOVERSION := $(shell go version | awk '{print $$3;}'))$(GOVERSION)
SRCS = $(shell find . -type f -name '*.go' | \grep -v 'vendor')
PACKAGES = $(shell ./scripts/_packages.sh)
GOVERSION = $(shell go version | awk '{print $$3;}')

.DEFAULT_GOAL := bin/$(NAME)

Expand All @@ -16,6 +22,12 @@ mod-dl:
mod-tidy:
@GO111MODULE=on go mod tidy

list-versions-aws-sdk-go:
@go list -u -m -versions $(AWS_SDK_GO_PKG) | tr ' ' '\n'

update-aws-sdk-go:
@read -p 'Input Module Query(e.g. "<v1.20")?: ' query; echo query=$$query; GO111MODULE=on go get $(AWS_SDK_GO_PKG)@''$$query''

bin/$(NAME): $(SRCS)
@./scripts/build.sh bin/$(NAME)

Expand Down Expand Up @@ -69,6 +81,7 @@ vendor-build:
lint-travis:
@travis lint --org --debug .travis.yml

# Note: require "brew install rpmbuild" on OS X
test-goreleaser:
@GOVERSION=$(GOVERSION) goreleaser release --snapshot --skip-publish --rm-dist

Expand All @@ -82,3 +95,6 @@ clean:
@rm -fr dist pkg
@find . -name '*.test' -delete
@rm -fr $(PROF_DIR)

mod-clean:
@go clean -modcache
2 changes: 1 addition & 1 deletion cmd/lsec2/version/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package version

// VERSION says my version number
const VERSION = "0.2.7"
const VERSION = "0.2.8"
4 changes: 2 additions & 2 deletions cmd/lsec2/version/version_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
)

func TestVersion(t *testing.T) {
exp := "0.2.7"
if VERSION != "0.2.7" {
exp := "0.2.8"
if VERSION != "0.2.8" {
t.Errorf("expected: %#v, but actual: %#v", exp, VERSION)
}
}
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/goldeneggg/lsec2

require (
github.com/aws/aws-sdk-go v1.17.14
github.com/aws/aws-sdk-go v1.19.24
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/color v1.7.0
github.com/mattn/go-colorable v0.1.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/aws/aws-sdk-go v1.17.14 h1:IjqZDIQoLyZ48A93BxVrZOaIGgZPRi4nXt6WQUMJplY=
github.com/aws/aws-sdk-go v1.17.14/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.19.24 h1:qOIYaFxcFg07Vdn799ERpGiuUUIEi5MQ2vYib3CNMp4=
github.com/aws/aws-sdk-go v1.19.24/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
Expand Down

0 comments on commit 2423430

Please sign in to comment.