[v1] ci: Unify the GitLab CI jobs with local executions && adopt lcitool container executions

[libvirt PATCH 12/33] ci: build.sh: Add a wrapper function over the 'website' job

Posted by Erik Skultety 2 years, 5 months ago

This helper is a shell function transcript of its original GitLab CI
counterpart.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---
 ci/build.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ci/build.sh b/ci/build.sh
index 30f4712e4b..6673ec6b18 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -105,3 +105,11 @@ run_rpmbuild() {
     run_meson_setup
     run_dist
 }
+
+run_website_build() {
+    export DESTDIR="$(pwd)/install"
+    BUILD_ARGS="install-web"
+
+    run_meson_setup
+    run_build
+}
-- 
2.41.0

Re: [libvirt PATCH 12/33] ci: build.sh: Add a wrapper function over the 'website' job

Posted by Daniel P. Berrangé 2 years, 5 months ago

On Fri, Aug 25, 2023 at 07:55:20PM +0200, Erik Skultety wrote:
> This helper is a shell function transcript of its original GitLab CI
> counterpart.
> 
> Signed-off-by: Erik Skultety <eskultet@redhat.com>
> ---
>  ci/build.sh | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/ci/build.sh b/ci/build.sh
> index 30f4712e4b..6673ec6b18 100644
> --- a/ci/build.sh
> +++ b/ci/build.sh
> @@ -105,3 +105,11 @@ run_rpmbuild() {
>      run_meson_setup
>      run_dist
>  }
> +
> +run_website_build() {
> +    export DESTDIR="$(pwd)/install"

Perhaps use ${GIT_ROOT} instead of $(pwd) to make this stable
regardless of pwd

> +    BUILD_ARGS="install-web"
> +
> +    run_meson_setup

Redundant call

> +    run_build
> +}
> -- 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|