[PATCH 1/2] gitlab: introduce CI jobs for building content

[Andrea Bolognani]

On Fri, 2020-05-15 at 17:37 +0100, Daniel P. Berrangé wrote:
> +ubuntu-2004-container:
> +  <<: *container_job_definition
> +  variables:
> +    NAME: ubuntu-2004
> +
> +
> +

Way too many empty lines here :)

> +# ubuntu-2004-docs is special as it is the one
> +# we publish from
> +pages:
> +  <<: *docs_job_definition
> +  variables:
> +    NAME: ubuntu-2004
> +  artifacts:
> +    paths:
> +      - public

It's kinda weird that this one has a different name despite being
part of the same stage... Maybe ubuntu-2004-pages? Either way you're
going to have to update the comment to reflect the actual name of
the job.

> +++ b/Makefile
> @@ -3,17 +3,18 @@ prefix=/usr
>  datadir=$(prefix)/share
>  pkgdatadir=$(datadir)/publican
>  contentdir=$(pkgdatadir)/Common_Content
> +branddir=$(contentdir)
>  
>  all: html pdf
>  
>  html:
> -	publican build --langs=en-US --formats=html --common_content=$(contentdir)
> +	publican build --langs=en-US --formats=html --common_content=$(contentdir) --brand_dir=$(branddir)
>  
>  pdf:
> -	publican build --langs=en-US --formats=pdf --common_content=$(contentdir)
> +	publican build --langs=en-US --formats=pdf --common_content=$(contentdir) --brand_dir=$(branddir)
>  
>  rpm:
> -	publican package --lang=en-US --binary --desktop --common_content=$(contentdir)
> +	publican package --lang=en-US --binary --desktop --common_content=$(contentdir) --brand_dir=$(branddir)
>  
>  clean:
>  	publican clean --common_content=$(contentdir)

Apologies for failing to point this out in v1, but these changes make
sense on their own, so please split them off to a separate patch.

Both for the new patch with the hunk above and the current one,

  Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization