From c1e40e273ed96ce4f9f5f544bb2f671d7beb3ddd Mon Sep 17 00:00:00 2001 From: Wataru Ishida Date: Wed, 24 Feb 2021 17:35:03 +0000 Subject: [PATCH] ci: test SFF TAI library build Signed-off-by: Wataru Ishida --- .github/workflows/ci.yml | 4 ++-- tai_mux/Makefile | 3 +++ tai_sff/Makefile | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40fc8f8..52210ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,5 +12,5 @@ jobs: - uses: actions/checkout@v2 with: submodules: true - - run: make -C tai_mux builder - - run: TAI_DOCKER_RUN_OPTION='--rm' TAI_DOCKER_CMD='make test' make -C tai_mux cmd + - run: make -C tai_mux ci + - run: make -C tai_sff ci diff --git a/tai_mux/Makefile b/tai_mux/Makefile index 5a69a21..b516547 100644 --- a/tai_mux/Makefile +++ b/tai_mux/Makefile @@ -71,6 +71,9 @@ builder: bash: $(MAKE) cmd +ci: builder + TAI_DOCKER_RUN_OPTION='--rm' TAI_DOCKER_CMD='make test' $(MAKE) cmd + clean: $(RM) -r $(BUILDDIR) $(TARGET) diff --git a/tai_sff/Makefile b/tai_sff/Makefile index 801c92a..631eba3 100644 --- a/tai_sff/Makefile +++ b/tai_sff/Makefile @@ -56,7 +56,7 @@ test: $(MAKE) -C tests cmd: - TAI_DOCKER_CMD="$(TAI_DOCKER_CMD)" TAI_DOCKER_RUN_OPTION="--privileged --net=host -it --rm" TAI_DOCKER_MOUNT="`pwd`:/data" $(MAKE) -C $(TAI_DIR) $@ + TAI_DOCKER_CMD="$(TAI_DOCKER_CMD)" TAI_DOCKER_RUN_OPTION="--privileged --net=host --rm" TAI_DOCKER_MOUNT="`pwd`:/data" $(MAKE) -C $(TAI_DIR) $@ docker: TAI_DOCKER_CMD="make" $(MAKE) cmd @@ -67,6 +67,8 @@ builder: bash: $(MAKE) cmd +ci: builder docker + clean: $(RM) -r $(BUILDDIR) $(TARGET)