From 68d3fe2ed9b72c276cb185b0f56b6536596dcf30 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Tue, 8 Oct 2019 10:18:34 -0400 Subject: [PATCH] fix ci setup --- .circleci/config.yml | 6 +++--- Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4afc0ff..74ad8fd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ jobs: - restore_cache: keys: - golang-1.11-{{ checksum "go.sum" }} - - run: make setup + - run: make setup-ci - save_cache: key: golang-1.11-{{ checksum "go.sum" }} paths: @@ -32,7 +32,7 @@ jobs: - restore_cache: keys: - golang-1.12-{{ checksum "go.sum" }} - - run: make setup + - run: make setup-ci - save_cache: key: golang-1.12-{{ checksum "go.sum" }} paths: @@ -52,7 +52,7 @@ jobs: - restore_cache: keys: - golang-1.13-{{ checksum "go.sum" }} - - run: make setup + - run: make setup-ci - save_cache: key: golang-1.13-{{ checksum "go.sum" }} paths: diff --git a/Makefile b/Makefile index e9a2f8c..ac291e5 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,8 @@ 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: +setup-ci: + sudo apt update && sudo apt install -y libgpgme-dev libbtrfs-dev libdevmapper-dev go get ./... curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b /go/bin v1.18.0