From 5679faecdb05ca836f62a40f240c3a87046cca09 Mon Sep 17 00:00:00 2001 From: Suyono Date: Mon, 18 Dec 2023 12:28:14 +0000 Subject: [PATCH] chore: exclude test binary on default build --- Makefile | 17 ++++++++++++++--- docker/alpine/Dockerfile | 1 + docker/bookworm/Dockerfile | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dc17224..0da4d56 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,13 @@ DESTDIR = /usr/local/bin -all: wingmate dummy oneshot spawner starter pidproxy exec +installs = install-dir +programs = wingmate pidproxy exec +ifdef TEST_BUILD + programs += oneshot spawner starter dummy + installs += install-test +endif + +all: ${programs} wingmate: $(MAKE) -C cmd/wingmate all @@ -32,12 +39,16 @@ clean: $(MAKE) -C cmd/experiment/spawner clean $(MAKE) -C cmd/experiment/starter clean -install: - install -d ${DESTDIR} +install: ${installs} $(MAKE) -C cmd/wingmate DESTDIR=${DESTDIR} install $(MAKE) -C cmd/pidproxy DESTDIR=${DESTDIR} install $(MAKE) -C cmd/exec DESTDIR=${DESTDIR} install + +install-test: $(MAKE) -C cmd/experiment/dummy DESTDIR=${DESTDIR} install $(MAKE) -C cmd/experiment/oneshot DESTDIR=${DESTDIR} install $(MAKE) -C cmd/experiment/spawner DESTDIR=${DESTDIR} install $(MAKE) -C cmd/experiment/starter DESTDIR=${DESTDIR} install + +install-dir: + install -d ${DESTDIR} diff --git a/docker/alpine/Dockerfile b/docker/alpine/Dockerfile index e0cda67..c3249ed 100644 --- a/docker/alpine/Dockerfile +++ b/docker/alpine/Dockerfile @@ -2,6 +2,7 @@ FROM golang:1.21-alpine as builder ADD . /root/wingmate WORKDIR /root/wingmate/ +ARG TEST_BUILD RUN apk add make build-base && CGO_ENABLED=1 make all && make DESTDIR=/usr/local/bin/wingmate install diff --git a/docker/bookworm/Dockerfile b/docker/bookworm/Dockerfile index 3a0491a..9021fc9 100644 --- a/docker/bookworm/Dockerfile +++ b/docker/bookworm/Dockerfile @@ -2,6 +2,7 @@ FROM golang:1.21-bookworm as builder ADD . /root/wingmate WORKDIR /root/wingmate/ +ARG TEST_BUILD RUN make all && make DESTDIR=/usr/local/bin/wingmate install