[libvirt PATCH 20/33] .gitlab-ci.yml: Convert the codestyle job to the build.sh usage

Erik Skultety posted 33 patches 2 years, 5 months ago
There is a newer version of this series
[libvirt PATCH 20/33] .gitlab-ci.yml: Convert the codestyle job to the build.sh usage
Posted by Erik Skultety 2 years, 5 months ago
Individual shell command executions are replaced by respective
functions in the ci/build.sh base script. This will make sure we use
the same recipes in GitLab jobs as well as in local executions.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---
 .gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0450c1f6ad..0ed6504dc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -114,10 +114,8 @@ website_local_env:
 .codestyle_job:
   stage: sanity_checks
   script:
-    - *script_variables
-    - meson setup build --werror || (cat build/meson-logs/meson-log.txt && exit 1)
-    - meson compile -C build libvirt-pot-dep
-    - meson test -C build --suite syntax-check --no-rebuild --print-errorlogs
+    - source ci/build.sh
+    - run_codestyle
 
 codestyle_prebuilt_env:
   extends:
-- 
2.41.0
Re: [libvirt PATCH 20/33] .gitlab-ci.yml: Convert the codestyle job to the build.sh usage
Posted by Daniel P. Berrangé 2 years, 5 months ago
On Fri, Aug 25, 2023 at 07:55:28PM +0200, Erik Skultety wrote:
> Individual shell command executions are replaced by respective
> functions in the ci/build.sh base script. This will make sure we use
> the same recipes in GitLab jobs as well as in local executions.
> 
> Signed-off-by: Erik Skultety <eskultet@redhat.com>
> ---
>  .gitlab-ci.yml | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

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


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