From 33aea0931f27c8664326c5cd586327e983b56bd8 Mon Sep 17 00:00:00 2001 From: Ruidong Cao Date: Fri, 31 Aug 2018 11:56:17 +0800 Subject: [PATCH] CI: Add "make proto" Allow make proto to work under the CI. So later we are able to check pb.go files in CI. fixes #340 Signed-off-by: Ruidong Cao --- .ci/run.sh | 3 +++ Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/run.sh b/.ci/run.sh index 3b2b7d7c2a..905e40564f 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -11,4 +11,7 @@ source "${cidir}/lib.sh" pushd "${tests_repo_dir}" .ci/run.sh +testcidir=$(dirname "$0") +"${testcidir}/../cmd/container-manager/manage_ctr_mgr.sh" docker configure -r runc -f popd +make proto diff --git a/Makefile b/Makefile index 59e331f4ad..448082c660 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ build-image: docker build ${BUILDARGS} -t ${AGENT_IMAGE}:${AGENT_TAG} . proto: build-image - docker run -ti -v ${PWD}:/go/src/github.com/kata-containers/agent ${AGENT_IMAGE}:${AGENT_TAG} ./hack/update-generated-agent-proto.sh + docker run -i -v ${PWD}:/go/src/github.com/kata-containers/agent ${AGENT_IMAGE}:${AGENT_TAG} ./hack/update-generated-agent-proto.sh .PHONY: clean test clean: