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 1 month 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
35 35
 .error "JOB_PORT variable is not set!"
36 36
 .endif
37 37
 
38
-all: checkout build clean
38
+all: pre-clean checkout build post-clean
39 39
 
40
-checkout: clean
40
+checkout:
41 41
 	git clone ${REPO_URL} ${REPODIR}
42 42
 	git -C "${REPODIR}" -c advice.detachedHead=false checkout ${COMMIT_ID}
43 43
 	@echo
@@ -45,7 +45,7 @@ checkout: clean
45 45
 build:
46 46
 	portlint -A ${REPODIR}/${JOB_PORT}
47 47
 
48
-clean:
48
+pre-clean post-clean:
49 49
 	rm -rf ${REPODIR}
50 50
 
51
-.PHONY: all checkout build clean
51
+.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
58 58
 .export REPODIR
59 59
 .export PORTSPATH
60 60
 
61
-all: checkout prepare build clean
61
+all: pre-clean checkout prepare build post-clean
62 62
 
63
-checkout: clean
63
+checkout:
64 64
 	git clone ${REPO_URL} ${REPODIR}
65 65
 	git -C "${REPODIR}" -c advice.detachedHead=false checkout ${COMMIT_ID}
66 66
 
@@ -76,9 +76,9 @@ prepare:
76 76
 build:
77 77
 	poudriere testport -j ${JAIL_NAME} -p ${PORTSTREE} ${JOB_PORT}
78 78
 
79
-clean:
79
+pre-clean post-clean:
80 80
 	rm -rf ${REPODIR}
81 81
 	@zfs rollback ${ZPORTSFS}@clean || true
82 82
 	@zfs destroy ${ZPORTSFS}@clean || true
83 83
 
84
-.PHONY: all checkout prepare build clean
84
+.PHONY: all checkout prepare build pre-clean post-clean

Loading…
Cancel
Save