Skip to content

Commit 1b1bb48

Browse files
committed
adds a new install-deps in the makefile; and some debug out
Signed-off-by: Mike Brown <[email protected]>
1 parent ce8e8e8 commit 1b1bb48

1 file changed

Lines changed: 16 additions & 2 deletions

File tree

Makefile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ TESTFLAGS_PARALLEL ?= 8
124124
OUTPUTDIR = $(join $(ROOTDIR), _output)
125125
CRIDIR=$(OUTPUTDIR)/cri
126126

127-
.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
127+
.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
128128
.DEFAULT: default
129129

130130
all: binaries
@@ -263,6 +263,7 @@ release: releases/$(RELEASE).tar.gz
263263
@echo "$(WHALE) $@"
264264
@cd releases && sha256sum $(RELEASE).tar.gz >$(RELEASE).tar.gz.sha256sum
265265

266+
# install of cri deps into release output directory
266267
ifeq ($(GOOS),windows)
267268
install-cri-deps: $(BINARIES)
268269
mkdir -p $(CRIDIR)
@@ -344,6 +345,19 @@ uninstall:
344345
@echo "$(WHALE) $@"
345346
@rm -f $(addprefix $(DESTDIR)/bin/,$(notdir $(BINARIES)))
346347

348+
#TODO(mikebrow): refactor install-critools and install-cni to work for local host and for release
349+
ifeq ($(GOOS),windows)
350+
install-deps:
351+
script/setup/install-runc
352+
#script/setup/install-critools
353+
#script/setup/install-cni-windows
354+
else
355+
install-deps: ## install cri dependencies
356+
script/setup/install-seccomp
357+
script/setup/install-runc
358+
#script/setup/install-critools
359+
#script/setup/install-cni
360+
endif
347361

348362
coverage: ## generate coverprofiles from the unit tests, except tests that require root
349363
@echo "$(WHALE) $@"
@@ -374,7 +388,7 @@ root-coverage: ## generate coverage profiles for unit tests that require root
374388
fi; \
375389
done )
376390

377-
vendor:
391+
vendor: ## vendor
378392
@echo "$(WHALE) $@"
379393
@go mod tidy
380394
@go mod vendor

0 commit comments

Comments
 (0)