From 9236307e2946e2de9b3abe1c2be6a1f6f641b418 Mon Sep 17 00:00:00 2001
From: Alex Goodman <wagoodman@gmail.com>
Date: Tue, 17 Sep 2019 21:13:46 -0400
Subject: [PATCH] golang 1.13 support for linting
---
.circleci/config.yml | 9 +++------
Makefile | 4 ++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4efc2c7..67c9154 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,8 +12,7 @@ jobs:
- restore_cache:
keys:
- golang-1.11-{{ checksum "go.sum" }}
- - run: go get ./...
- - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b /go/bin v1.17.1
+ - run: make setup
- save_cache:
key: golang-1.11-{{ checksum "go.sum" }}
paths:
@@ -33,8 +32,7 @@ jobs:
- restore_cache:
keys:
- golang-1.12-{{ checksum "go.sum" }}
- - run: go get ./...
- - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b /go/bin v1.17.1
+ - run: make setup
- save_cache:
key: golang-1.12-{{ checksum "go.sum" }}
paths:
@@ -54,8 +52,7 @@ jobs:
- restore_cache:
keys:
- golang-1.13-{{ checksum "go.sum" }}
- - run: go get ./...
- - run: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b /go/bin v1.17.1
+ - run: make setup
- save_cache:
key: golang-1.13-{{ checksum "go.sum" }}
paths:
diff --git a/Makefile b/Makefile
index 58de9a7..06cf507 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,10 @@ lint: build
generate-test-data:
docker build -t dive-test:latest -f .data/Dockerfile.test-image . && docker image save -o .data/test-docker-image.tar dive-test:latest && echo "Exported test data!"
+setup:
+ go get ./...
+ curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b /go/bin v1.18.0
+
clean:
rm -rf build
go clean