removes hack versions; splits update vendor and makes it optional

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown
2018-02-06 19:58:28 -06:00
parent 561d045d71
commit 84139b4241
9 changed files with 67 additions and 35 deletions

View File

@@ -57,8 +57,9 @@ help:
@echo " * 'install.deps' - Install dependencies of cri-containerd (containerd, runc, cni) Note: BUILDTAGS defaults to 'seccomp apparmor' for runc build"
@echo " * 'uninstall' - Remove installed binaries from system locations"
@echo " * 'version' - Print current cri-containerd release version"
@echo " * 'update-vendor' - Syncs containerd/vendor.conf -> vendor.conf and sorts vendor.conf"
verify: lint gofmt boiler deps-version
verify: lint gofmt boiler
version:
@echo $(VERSION)
@@ -75,9 +76,17 @@ boiler:
@echo "checking boilerplate"
@./hack/verify-boilerplate.sh
deps-version:
@echo "checking /hack/versions"
@./hack/update-vendor.sh -only-verify
.PHONY: sort-vendor sync-vendor update-vendor
sort-vendor:
@echo "sorting vendor.conf"
@./hack/sort-vendor.sh
sync-vendor:
@echo "syncing vendor.conf from containerd"
@./hack/sync-vendor.sh
update-vendor: sync-vendor sort-vendor
$(BUILD_DIR)/cri-containerd: $(SOURCES)
$(GO) build -o $@ \
@@ -134,7 +143,7 @@ uninstall:
rm -f $(BINDIR)/cri-containerd
rm -f $(BINDIR)/ctrcri
$(BUILD_DIR)/$(TARBALL): static-binaries hack/versions
$(BUILD_DIR)/$(TARBALL): static-binaries vendor.conf
@BUILD_DIR=$(BUILD_DIR) TARBALL=$(TARBALL) ./hack/release.sh
release: $(BUILD_DIR)/$(TARBALL)