From 7f2adaa3d86a2e8ee5eecadd64cbf75f770c3691 Mon Sep 17 00:00:00 2001 From: Erik Skultety Date: Thu, 24 Aug 2023 16:05:41 +0200 Subject: [PATCH] .gitlab-ci.yml: Convert the codestyle job to the build.sh usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Daniel P. Berrangé --- .gitlab-ci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d41cc63ec2..35f1a1e135 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/jobs.sh + - run_codestyle codestyle_prebuilt_env: extends: