Merge pull request #5132 from mikebrow/add-some-debug-out-for-dep-setups

adds a new install-deps in the makefile; and some refactoring of the scripts
This commit is contained in:
Mike Brown
2021-03-24 15:28:16 -05:00
committed by GitHub
4 changed files with 33 additions and 7 deletions

View File

@@ -123,7 +123,7 @@ TESTFLAGS_PARALLEL ?= 8
OUTPUTDIR = $(join $(ROOTDIR), _output)
CRIDIR=$(OUTPUTDIR)/cri
.PHONY: clean all AUTHORS build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release mandir install-man genman install-cri-deps cri-release cri-cni-release cri-integration bin/cri-integration.test
.PHONY: clean all AUTHORS build binaries test integration generate protos checkprotos coverage ci check help install uninstall vendor release mandir install-man genman install-cri-deps cri-release cri-cni-release cri-integration install-deps bin/cri-integration.test
.DEFAULT: default
all: binaries
@@ -262,6 +262,7 @@ release: releases/$(RELEASE).tar.gz
@echo "$(WHALE) $@"
@cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum
# install of cri deps into release output directory
ifeq ($(GOOS),windows)
install-cri-deps: $(BINARIES)
mkdir -p $(CRIDIR)
@@ -343,6 +344,18 @@ uninstall:
@echo "$(WHALE) $@"
@rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES)))
ifeq ($(GOOS),windows)
install-deps:
# TODO: need a script for hcshim something like containerd/cri/hack/install/windows/install-hcsshim.sh
script/setup/install-critools
script/setup/install-cni-windows
else
install-deps: ## install cri dependencies
script/setup/install-seccomp
script/setup/install-runc
script/setup/install-critools
script/setup/install-cni
endif
coverage: ## generate coverprofiles from the unit tests, except tests that require root
@echo "$(WHALE) $@"
@@ -373,7 +386,7 @@ root-coverage: ## generate coverage profiles for unit tests that require root
fi; \
done )
vendor:
vendor: ## vendor
@echo "$(WHALE) $@"
@go mod tidy
@go mod vendor