On Wed, 2020-05-06 at 16:24 +0100, Daniel P. Berrangé wrote:
> +.git_build_job_template: &git_build_job_definition
> +  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
> +  stage: builds
> +  before_script:
> +    - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
> +    - export SCRATCH_DIR="/tmp/scratch"
> +    - export VROOT="$SCRATCH_DIR/vroot"
> +    - export LD_LIBRARY_PATH="$VROOT/lib"
> +    - export PATH="$VROOT/bin:$PATH"
> +    - export PKG_CONFIG_PATH="$VROOT/lib/pkgconfig"
> +  script:
> +    - pushd "$PWD"
> +    - mkdir -p "$SCRATCH_DIR"
> +    - cd "$SCRATCH_DIR"
> +    - git clone --depth 1 https://gitlab.com/libvirt/libvirt.git
> +    - mkdir libvirt/build
> +    - cd libvirt/build
> +    - ../autogen.sh --prefix="$VROOT" --without-libvirtd
> +    - $MAKE install
> +    - popd
> +    - autoreconf -i -f
> +    - ./configure
> +    - $MAKE
> +    - $MAKE check-manifest

The build steps for libvirt-ocaml that we have in the libvirt-ci
repository look like

  autoreconf -vfi
  ./configure
  $MAKE
  $MAKE opt
  $MAKE check-manifest

Please use the same here...

> +.dist_build_job_template: &dist_build_job_definition
> +  image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
> +  stage: builds
> +  before_script:
> +    - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
> +  script:
> +    - autoreconf -i -f
> +    - ./configure
> +    - $MAKE
> +    - $MAKE check-manifest

... and here.


With that addressed,

  Reviewed-by: Andrea Bolognani <abolo...@redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization

Reply via email to