Browse Source

Fix clean targets to have multiple names so it can be called more than once per build

PR:		#2
Reported by:	douglaswth
tags/v0.2.0^0
Bernhard Fröhlich 3 months ago
parent
commit
06df9a434b
Signed by: Bernhard Froehlich <decke@bluelife.at> GPG Key ID: 4DD88C3F9F3B8333
2 changed files with 8 additions and 8 deletions
  1. 4
    4
      work/portlint.mk
  2. 4
    4
      work/poudriere.mk

+ 4
- 4
work/portlint.mk View File

@@ -35,9 +35,9 @@ 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
@@ -45,7 +45,7 @@ checkout: clean
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

+ 4
- 4
work/poudriere.mk View File

@@ -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

Loading…
Cancel
Save