build: skip github lockdown file in manifest check

[PATCH ocaml] build: skip github lockdown file in manifest check

Posted by Daniel P. Berrangé 4 years ago

The github lockdown file is not intended to be included in any built
dist, so should be excluded when checking the manifest.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

Pushed as a CI build fix

 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 4357ba6..54ecaf3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,7 +86,7 @@ dist: ChangeLog
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-	git ls-files > .check-manifest; \
+	git ls-files | grep -v .github/lockdown.yml > .check-manifest; \
 	echo aclocal.m4 >> .check-manifest; \
 	sort -o .check-manifest .check-manifest; \
 	sort MANIFEST > .orig-manifest; \
-- 
2.24.1

Re: [PATCH ocaml] build: skip github lockdown file in manifest check

Posted by Pino Toscano 4 years ago

On Tuesday, 7 April 2020 20:14:44 CEST Daniel P. Berrangé wrote:
> The github lockdown file is not intended to be included in any built
> dist, so should be excluded when checking the manifest.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> 
> Pushed as a CI build fix
> 
>  Makefile.in | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.in b/Makefile.in
> index 4357ba6..54ecaf3 100644
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -86,7 +86,7 @@ dist: ChangeLog
>  	ls -l $(PACKAGE)-$(VERSION).tar.gz
>  
>  check-manifest:
> -	git ls-files > .check-manifest; \
> +	git ls-files | grep -v .github/lockdown.yml > .check-manifest; \

Thanks, this seems OK.

Maybe one small improvement if you have the time/will: skip the entire
.github/ toplevel directory, so in case we add more files there it will
not require any change.

Thanks,
-- 
Pino Toscano