Skip to content
Permalink
Browse files

Fix clean targets to have multiple names so it can be called more tha…

…n once per build

PR:		#2
Reported by:	douglaswth
  • Loading branch information...
decke committed Jun 11, 2019
1 parent 2c3305b commit 06df9a434b144114b745e388993225fa41828d93
Showing with 8 additions and 8 deletions.
  1. +4 −4 work/portlint.mk
  2. +4 −4 work/poudriere.mk
@@ -35,17 +35,17 @@ REPODIR?= ${WORKDIR}/repo.git
.error "JOB_PORT variable is not set!"
.endif

all: checkout build clean
all: pre-clean checkout build post-clean

checkout: clean
checkout:
git clone ${REPO_URL} ${REPODIR}
git -C "${REPODIR}" -c advice.detachedHead=false checkout ${COMMIT_ID}
@echo

build:
portlint -A ${REPODIR}/${JOB_PORT}

clean:
pre-clean post-clean:
rm -rf ${REPODIR}

.PHONY: all checkout build clean
.PHONY: all checkout build pre-clean post-clean
@@ -58,9 +58,9 @@ PORTSPATH!= zfs get -H mountpoint ${ZPORTSFS} | cut -f3
.export REPODIR
.export PORTSPATH

all: checkout prepare build clean
all: pre-clean checkout prepare build post-clean

checkout: clean
checkout:
git clone ${REPO_URL} ${REPODIR}
git -C "${REPODIR}" -c advice.detachedHead=false checkout ${COMMIT_ID}

@@ -76,9 +76,9 @@ prepare:
build:
poudriere testport -j ${JAIL_NAME} -p ${PORTSTREE} ${JOB_PORT}

clean:
pre-clean post-clean:
rm -rf ${REPODIR}
@zfs rollback ${ZPORTSFS}@clean || true
@zfs destroy ${ZPORTSFS}@clean || true

.PHONY: all checkout prepare build clean
.PHONY: all checkout prepare build pre-clean post-clean

0 comments on commit 06df9a4

Please sign in to comment.
You can’t perform that action at this time.