Skip to content

Commit

Permalink
appeasing the module linter gods
Browse files Browse the repository at this point in the history
  • Loading branch information
gavincabbage committed Mar 31, 2019
1 parent 6466c4b commit f7907c8
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 40 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ ARG GO_VERSION=1.12

FROM golang:${GO_VERSION}-alpine

ENV GOBIN=/bin
ENV PATH=${GOBIN}:${PATH}

RUN apk update
RUN apk add --no-cache \
build-base \
Expand All @@ -12,8 +15,8 @@ WORKDIR /chiv

COPY go.mod .
COPY go.sum .
COPY Makefile .

RUN make setup
RUN go mod download
RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint

COPY . .
28 changes: 0 additions & 28 deletions Makefile

This file was deleted.

File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/chiv/chiv_test.go → chiv_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/gavincabbage/pkg/chiv"
"github.com/gavincabbage/chiv"
)

func TestArchiver_Archive(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions codeship-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
steps:
- name: test
service: test
command: make test
command: go test -p 1 -covermode=atomic -timeout=30s ./...
- name: lint
service: lint
command: make lint
command: golangci-lint run
File renamed without changes.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/gavincabbage/chiv
go 1.12

require (
github.com/aws/aws-sdk-go v1.18.6
github.com/aws/aws-sdk-go v1.19.6
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/lib/pq v1.0.0
github.com/stretchr/testify v1.3.0
golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53 // indirect
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 // indirect
)
9 changes: 4 additions & 5 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
github.com/aws/aws-sdk-go v1.18.6 h1:NuUz/+bi6C5v3BpIXW/VfovfMpvlhl1WUnD0EiDkOwQ=
github.com/aws/aws-sdk-go v1.18.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/aws/aws-sdk-go v1.19.6 h1:q0NfR7x3yEWqKp2f5LWtm1ZqdXuA2WKnXRWUy17tiVc=
github.com/aws/aws-sdk-go v1.19.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
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=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -14,8 +13,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53 h1:kcXqo9vE6fsZY5X5Rd7R1l7fTgnWaDCVmln65REefiE=
golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190313220215-9f648a60d977 h1:actzWV6iWn3GLqN8dZjzsB+CLt+gaV2+wsxroxiQI8I=
golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
File renamed without changes.

0 comments on commit f7907c8

Please sign in to comment.