From c74eab1b85ba62e1bcb0e7fa3b6af619229bd72f Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@monax.io>
Date: Mon, 29 Jan 2018 18:00:05 +0000
Subject: [PATCH] Ensure vendor is what dep ensure would obtain in a fresh repo
Signed-off-by: Silas Davis <silas@monax.io>
---
.circleci/config.yml | 10 ++++++++--
.dockerignore | 1 -
Dockerfile | 2 --
Makefile | 13 ++++++++++---
scripts/is_checkout_dirty.sh | 4 ++++
5 files changed, 22 insertions(+), 8 deletions(-)
create mode 100755 scripts/is_checkout_dirty.sh
diff --git a/.circleci/config.yml b/.circleci/config.yml
index f2e5f2ea..5ca3be1e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,12 +41,12 @@ jobs:
at: .
- run: make test_integration
- test_integration:
+ ensure_vendor:
<<: *defaults
steps:
- attach_workspace:
at: .
- - run: make test_integration
+ - run: make ensure_vendor
build_docker:
<<: *defaults
@@ -114,6 +114,12 @@ workflows:
filters:
<<: *tags_filters
+ - ensure_vendor:
+ requires:
+ - checkout_code
+ filters:
+ <<: *tags_filters
+
- build_docker:
requires:
- checkout_code
diff --git a/.dockerignore b/.dockerignore
index 9a1e1647..516f24ac 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,4 +11,3 @@ CHANGELOG.md
README.md
.circleci
docs
-vendor
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 7a75ab32..d50e4600 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,12 +3,10 @@ FROM golang:1.9.0-alpine3.6 as builder
MAINTAINER Monax <support@monax.io>
RUN apk add --no-cache --update git
-RUN go get github.com/Masterminds/glide
ARG REPO=$GOPATH/src/github.com/hyperledger/burrow
COPY . $REPO
WORKDIR $REPO
-RUN glide install
# Build purely static binaries
RUN go build --ldflags '-extldflags "-static"' -o bin/burrow ./cmd/burrow
diff --git a/Makefile b/Makefile
index 945422b7..82dcd143 100644
--- a/Makefile
+++ b/Makefile
@@ -77,12 +77,19 @@ erase_vendor:
rm -rf ${REPO}/vendor/
# install vendor uses dep to install vendored dependencies
-.PHONY: install_vendor
-install_vendor:
+.PHONY: reinstall_vendor
+reinstall_vendor: erase_vendor
@go get -u github.com/golang/dep/cmd/dep
@dep ensure -v
-# Dumps Solidity interface contracts for SNatives
+# delete the vendor directy and pull back using dep lock and constraints file
+# will exit with an error if the working directory is not clean (any missing files or new
+# untracked ones)
+.PHONY: ensure_vendor
+ensure_vendor: reinstall_vendor
+ @scripts/is_checkout_dirty.sh
+
+# dumps Solidity interface contracts for SNatives
.PHONY: snatives
snatives:
@go run ./util/snatives/cmd/main.go
diff --git a/scripts/is_checkout_dirty.sh b/scripts/is_checkout_dirty.sh
new file mode 100755
index 00000000..dc8ce17c
--- /dev/null
+++ b/scripts/is_checkout_dirty.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Gives us a non-zero exit code if there are tracked or untracked changes in the working
+# directory
+exit $(git status --porcelain | wc -l)
--
GitLab