talkatu/builders

Make the debian builders build and not package as gi-docgen isn't in unstable yet

2021-10-18, Gary Kramlich
701bac734fbd
Parents c40af49a0bed
Children d226c08f6aa4
Make the debian builders build and not package as gi-docgen isn't in unstable yet
5 files changed, 14 insertions(+), 4 deletions(-)
  • +1 -1
    Dockerfile.debian-bookworm-amd64
  • +1 -1
    Dockerfile.debian-bookworm-arm64
  • +1 -1
    Dockerfile.debian-bookworm-armhf
  • +1 -1
    Dockerfile.debian-bookworm-i386
  • +10 -0
    meson/build.sh
    • --- a/Dockerfile.debian-bookworm-amd64 Mon Oct 18 15:32:05 2021 -0500
    +++ b/Dockerfile.debian-bookworm-amd64 Mon Oct 18 15:32:26 2021 -0500
    @@ -20,5 +20,5 @@
    ENV TARGET=debian-bookworm-amd64
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-arm64 Mon Oct 18 15:32:05 2021 -0500
    +++ b/Dockerfile.debian-bookworm-arm64 Mon Oct 18 15:32:26 2021 -0500
    @@ -18,5 +18,5 @@
    ENV TARGET=debian-bookworm-arm64
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-armhf Mon Oct 18 15:32:05 2021 -0500
    +++ b/Dockerfile.debian-bookworm-armhf Mon Oct 18 15:32:26 2021 -0500
    @@ -18,5 +18,5 @@
    ENV TARGET=debian-bookworm-armhf
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- a/Dockerfile.debian-bookworm-i386 Mon Oct 18 15:32:05 2021 -0500
    +++ b/Dockerfile.debian-bookworm-i386 Mon Oct 18 15:32:26 2021 -0500
    @@ -18,5 +18,5 @@
    ENV TARGET=debian-bookworm-i386
    -COPY debian/build.sh /build.sh
    +COPY meson/build.sh /build.sh
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/meson/build.sh Mon Oct 18 15:32:26 2021 -0500
    @@ -0,0 +1,10 @@
    +#!/bin/sh -ex
    +
    +cd ${CONVEY_WORKSPACE}
    +
    +BUILD_DIR=${TARGET:-_build}
    +
    +meson ${MESON_OPTIONS} "${BUILD_DIR}"
    +meson compile -C "${BUILD_DIR}"
    +meson test -C "${BUILD_DIR}"
    +