From 0b2455d2e620d5d063622ecd07ba430c0e36898d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Karas?= Date: Tue, 2 Jan 2024 20:49:44 +0100 Subject: [PATCH] add docker image for Meson build on Debian Bookworm --- ci/docker/buildAll.sh | 1 + .../debian_bookworm_gcc_meson/Dockerfile | 32 +++++++++++++++++++ ci/docker/debian_bookworm_gcc_meson/build.sh | 3 ++ .../debian_bookworm_gcc_meson/data/build.sh | 25 +++++++++++++++ ci/docker/debian_bookworm_gcc_meson/run.sh | 3 ++ ci/docker/runAll.sh | 6 ++++ 6 files changed, 70 insertions(+) create mode 100644 ci/docker/debian_bookworm_gcc_meson/Dockerfile create mode 100755 ci/docker/debian_bookworm_gcc_meson/build.sh create mode 100644 ci/docker/debian_bookworm_gcc_meson/data/build.sh create mode 100755 ci/docker/debian_bookworm_gcc_meson/run.sh diff --git a/ci/docker/buildAll.sh b/ci/docker/buildAll.sh index d5d2b0046..e1363e2c6 100755 --- a/ci/docker/buildAll.sh +++ b/ci/docker/buildAll.sh @@ -7,6 +7,7 @@ set -xe ./archlinux_gcc_meson/build.sh ./debian_buster_gcc_meson/build.sh ./debian_bullseye_gcc_meson/build.sh +./debian_bookworm_gcc_meson/build.sh ./ubuntu_22.04_gcc_cmake/build.sh ./ubuntu_22.04_gcc_meson_qt6/build.sh ./ubuntu_22.04_aarch64_gcc_cmake/build.sh diff --git a/ci/docker/debian_bookworm_gcc_meson/Dockerfile b/ci/docker/debian_bookworm_gcc_meson/Dockerfile new file mode 100644 index 000000000..c156b8cd9 --- /dev/null +++ b/ci/docker/debian_bookworm_gcc_meson/Dockerfile @@ -0,0 +1,32 @@ +FROM debian:bookworm + +RUN apt-get update && apt-get install -y \ + git make libtool pkg-config \ + libxml2-dev libprotobuf-dev protobuf-compiler \ + libagg-dev \ + libfreetype6-dev \ + libcairo2-dev \ + libpangocairo-1.0-0 libpango1.0-dev \ + qtdeclarative5-dev libqt5svg5-dev \ + qtlocation5-dev qtpositioning5-dev qttools5-dev-tools qttools5-dev qtmultimedia5-dev \ + freeglut3-dev libglew-dev libglm-dev \ + libtbb-dev liblzma-dev \ + libmarisa-dev \ + doxygen \ + locales \ + meson ninja-build g++ \ + && rm -rf /var/lib/apt/lists/* + +RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen +RUN locale-gen +ENV LANG en_US.utf8 + +ENV QT_QPA_PLATFORM offscreen + +RUN mkdir /work + +COPY data/build.sh /work +RUN chmod +x /work/build.sh + +WORKDIR /work +CMD ./build.sh diff --git a/ci/docker/debian_bookworm_gcc_meson/build.sh b/ci/docker/debian_bookworm_gcc_meson/build.sh new file mode 100755 index 000000000..15ad417b4 --- /dev/null +++ b/ci/docker/debian_bookworm_gcc_meson/build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd `dirname $0` +docker build -t libosmscout/debian_bullseye_gcc_meson . diff --git a/ci/docker/debian_bookworm_gcc_meson/data/build.sh b/ci/docker/debian_bookworm_gcc_meson/data/build.sh new file mode 100644 index 000000000..07f2abcb4 --- /dev/null +++ b/ci/docker/debian_bookworm_gcc_meson/data/build.sh @@ -0,0 +1,25 @@ +#!/bin/sh +set -e + +if [ $# -ge 1 ] ; then + REPO="$1" +else + REPO="https://github.com/Framstag/libosmscout.git" +fi + +if [ $# -ge 2 ] ; then + BRANCH="$2" +else + BRANCH="master" +fi + +git clone -b "$BRANCH" "$REPO" libosmscout + +env + +cd libosmscout +meson debug +cd debug + +ninja +ninja test diff --git a/ci/docker/debian_bookworm_gcc_meson/run.sh b/ci/docker/debian_bookworm_gcc_meson/run.sh new file mode 100755 index 000000000..3bd8bdec3 --- /dev/null +++ b/ci/docker/debian_bookworm_gcc_meson/run.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +docker run --rm=true -it libosmscout/debian_bullseye_gcc_meson ./build.sh "$@" diff --git a/ci/docker/runAll.sh b/ci/docker/runAll.sh index 1c5be7abf..cbe431039 100755 --- a/ci/docker/runAll.sh +++ b/ci/docker/runAll.sh @@ -17,6 +17,9 @@ RESULT_debian_buster_gcc_meson=$? ./debian_bullseye_gcc_meson/run.sh "$@" RESULT_debian_bullseye_gcc_meson=$? +./debian_bullseye_gcc_meson/run.sh "$@" +RESULT_debian_bookworm_gcc_meson=$? + ./ubuntu_22.04_gcc_cmake/run.sh "$@" RESULT_ubuntu_22_04_gcc_cmake=$? @@ -45,6 +48,9 @@ if [ $RESULT_debian_buster_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FA echo -ne "debian_bullseye_gcc_meson " if [ $RESULT_debian_bullseye_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi +echo -ne "debian_bullseye_gcc_meson " +if [ $RESULT_debian_bookworm_gcc_meson -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi + echo -ne "ubuntu_22.04_gcc_cmake " if [ $RESULT_ubuntu_22_04_gcc_cmake -eq 0 ] ; then echo "OK"; else echo "FAILURE"; fi