Merge pull request projectcalico#193 from neiljerram/fix-version-regex

Fix version regex to cover 'release-vX.Y' as well as SHA-1s
roshanirathi · Sep 18, 2018 · 42d09ff · 42d09ff
2 parents 18c5747 + 2055ad4
commit 42d09ff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -200,7 +200,7 @@ LIBCALICO_VERSION?=$(shell git ls-remote [email protected]:projectcalico/libcalico-
 update-libcalico:
 	$(DOCKER_GO_BUILD) sh -c '\
         echo "Updating libcalico to $(LIBCALICO_VERSION) from $(LIBCALICO_REPO)"; \
-        export OLD_VER=$$(grep --after 50 libcalico-go glide.yaml |grep --max-count=1 --only-matching --perl-regexp "version:\s*\K[\.0-9a-z]+") ;\
+        export OLD_VER=$$(grep --after 50 libcalico-go glide.yaml |grep --max-count=1 --only-matching --perl-regexp "version:\s*\K[^\s]+") ;\
         echo "Old version: $$OLD_VER";\
         if [ $(LIBCALICO_VERSION) != $$OLD_VER ]; then \
             sed -i "s/$$OLD_VER/$(LIBCALICO_VERSION)/" glide.yaml && \