Skip to content

Commit

Permalink
Merge pull request projectcalico#208 from neiljerram/glide-along
Browse files Browse the repository at this point in the history
Don't interpret glide WARN as a problem
  • Loading branch information
caseydavenport authored Nov 5, 2018
2 parents ac367c5 + 52bfd3f commit eca1081
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ DOCKER_RUN := mkdir -p .go-pkg-cache && \
--net=host \
$(EXTRA_DOCKER_ARGS) \
-e LOCAL_USER_ID=$(LOCAL_USER_ID) \
-v $(HOME)/.glide:/home/user/.glide:rw \
-v $(CURDIR):/go/src/$(PACKAGE_NAME):rw \
-v $(CURDIR)/.go-pkg-cache:/go/pkg:rw \
-w /go/src/$(PACKAGE_NAME) \
Expand Down Expand Up @@ -212,9 +213,7 @@ update-libcalico:
if [ $(LIBCALICO_REPO) != "github.com/projectcalico/libcalico-go" ]; then \
glide mirror set https://github.com/projectcalico/libcalico-go $(LIBCALICO_REPO) --vcs git; glide mirror list; \
fi;\
OUTPUT=`mktemp`;\
glide up --strip-vendor; glide up --strip-vendor 2>&1 | tee $$OUTPUT; \
if ! grep "\[WARN\]" $$OUTPUT; then true; else false; fi; \
glide up --strip-vendor || glide up --strip-vendor; \
fi'

bin/calico-typha: bin/calico-typha-$(ARCH)
Expand Down

0 comments on commit eca1081

Please sign in to comment.