On Thu, 2020-06-25 at 17:14 +0100, Daniel P. Berrangé wrote:
+.git_native_build_job_template:
&git_native_build_job_definition
+ image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
+ stage: builds
+ cache:
+ paths:
+ - ccache/
+ key: "$CI_JOB_NAME"
+ before_script:
+ - *script_variables
+ script:
[...]
+ - meson build --prefix="$VROOT"
+ - $NINJA -C build
+ - if test "$TESTS" != "skip";
+ then
+ $NINJA -C build test;
+ $NINJA -C build install;
+ $NINJA -C build dist;
We can still run 'ninja install' even when we're told to skip tests,
as the two are not related.
> +.dist_native_build_job_template: &dist_native_build_job_definition
> + image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
> + stage: builds
> + cache:
> + paths:
> + - ccache/
> + key: "$CI_JOB_NAME"
> + before_script:
> + - *script_variables
> + script:
+ - meson build --prefix="$VROOT"
+ - $NINJA -C build
+ - if test "$TESTS" != "skip";
+ then
+ $NINJA -C build test;
+ $NINJA -C build install;
+ $NINJA -C build dist;
Same here.
With that changed,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
--
Andrea Bolognani / Red Hat / Virtualization