From 13c38abf36038997f3ad3e30915678b0354e3404 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 7 Dec 2022 08:49:59 +0100 Subject: [PATCH 1/2] fix CI Signed-off-by: Steffen Vogel --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a68c67829..0c6a2dbe4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - GIT_STRATEGY: fetch GIT_SUBMODULE_STRATEGY: recursive + GIT_DEPTH: 0 DISTRO: fedora # standard distro DOCKER_FILE: packaging/docker/Dockerfile.${DISTRO} DOCKER_TAG: ${CI_COMMIT_REF_NAME} From b6e31f9b3ed4af05dd4eec9a720cc26efd2a6dff Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 7 Dec 2022 09:29:51 +0100 Subject: [PATCH 2/2] ci: disable build of VILLASfpga Signed-off-by: Steffen Vogel --- .gitlab-ci.yml | 6 ++++-- packaging/docker/Dockerfile.debian | 4 +++- packaging/docker/Dockerfile.debian-multiarch | 6 ++++-- packaging/docker/Dockerfile.fedora | 4 +++- packaging/docker/Dockerfile.fedora-minimal | 5 ++++- packaging/docker/Dockerfile.rocky | 4 +++- packaging/docker/Dockerfile.ubuntu | 4 +++- 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c6a2dbe4..95e02019a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ variables: DOCKER_IMAGE_DEV: ${DOCKER_IMAGE}/dev-${DISTRO} DOCKER_CLI_EXPERIMENTAL: enabled MAKE_OPTS: "-j16" + CMAKE_OPTS: "-DWITH_FPGA=OFF" stages: - prepare @@ -49,7 +50,7 @@ build:source: image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG} script: - mkdir -p build && cd build - - cmake ${CMAKE_OPTS} .. + - cmake ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. - make ${MAKE_OPTS} artifacts: expire_in: 1 week @@ -61,7 +62,7 @@ build:source: matrix: - DISTRO: [ fedora, fedora-minimal, debian, rocky, ubuntu ] - DISTRO: fedora-minimal - CMAKE_OPTS: -DWITH_API=OFF + CMAKE_EXTRA_OPTS: -DWITH_API=OFF -DWITH_CLIENTS=OFF -DWITH_CONFIG=OFF -DWITH_DOC=OFF @@ -185,6 +186,7 @@ pkg:docker: --target ${TARGET} --build-arg ARCH=${ARCH} --build-arg TRIPLET=${TRIPLET} + --build-arg CMAKE_OPTS="${CMAKE_OPTS}" --platform ${PLATFORM} --file ${DOCKER_FILE} --tag ${DOCKER_IMAGE}:${DOCKER_TAG}-${ARCH} . diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index e04bab388..8f287d909 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -70,11 +70,13 @@ ENV LANG C.UTF-8 FROM dev AS app +ARG CMAKE_OPTS + COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake .. && \ +RUN cmake ${CMAKE_OPTS} .. && \ make -j$(nproc) doc && \ make -j$(nproc) install && \ ldconfig diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch index d7ca5177f..5959421c6 100644 --- a/packaging/docker/Dockerfile.debian-multiarch +++ b/packaging/docker/Dockerfile.debian-multiarch @@ -68,7 +68,7 @@ ADD cmake/toolchains/debian-${ARCH}.cmake / ENV PKG_CONFIG_PATH=/usr/lib/${TRIPLET}/pkgconfig:/usr/local/lib/${TRIPLET}/pkgconfig -ENV CMAKE_OPTS="-DCMAKE_TOOLCHAIN_FILE=/debian-${ARCH}.cmake \ +ENV CMAKE_EXTRA_OPTS="-DCMAKE_TOOLCHAIN_FILE=/debian-${ARCH}.cmake \ -DCMAKE_PREFIX_PATH=${PREFIX} \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DCMAKE_INSTALL_LIBDIR=${PREFIX}/lib/${TRIPLET} \ @@ -103,12 +103,14 @@ ENV LANG C.UTF-8 FROM dev AS builder +ARG CMAKE_OPTS + COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake ${CMAKE_OPTS} .. && \ +RUN cmake ${CMAKE_OPTS} ${CMAKE_EXTRA_OPTS} .. && \ make -j$(nproc) doc && \ make -j$(nproc) install diff --git a/packaging/docker/Dockerfile.fedora b/packaging/docker/Dockerfile.fedora index 8055644aa..64b6bb3a4 100644 --- a/packaging/docker/Dockerfile.fedora +++ b/packaging/docker/Dockerfile.fedora @@ -102,11 +102,13 @@ RUN groupadd --gid $USER_GID $USERNAME \ FROM dev AS app +ARG CMAKE_OPTS + COPY . /villas/ WORKDIR /villas/build RUN --mount=type=cache,id=${DISTRO}-${FEDORA_VERSION}-${ARCH}-${REF},target=/villas/build \ - cmake .. && \ + cmake ${CMAKE_OPTS} .. && \ make -j$(nproc) doc && \ make -j$(nproc) install && \ ldconfig diff --git a/packaging/docker/Dockerfile.fedora-minimal b/packaging/docker/Dockerfile.fedora-minimal index bea25b51e..a69946d35 100644 --- a/packaging/docker/Dockerfile.fedora-minimal +++ b/packaging/docker/Dockerfile.fedora-minimal @@ -7,6 +7,7 @@ ARG DISTRO=fedora ARG FEDORA_VERSION=34 + FROM ${DISTRO}:${FEDORA_VERSION} AS dev # Toolchain @@ -31,12 +32,14 @@ ENV LANG C.UTF-8 FROM dev AS builder +ARG CMAKE_OPTS + COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake -DCPACK_GENERATOR=RPM .. && \ +RUN cmake ${CMAKE_OPTS} -DCPACK_GENERATOR=RPM .. && \ make -j$(nproc) doc && \ make -j$(nproc) package diff --git a/packaging/docker/Dockerfile.rocky b/packaging/docker/Dockerfile.rocky index 4b2ec3958..0e1bc0004 100644 --- a/packaging/docker/Dockerfile.rocky +++ b/packaging/docker/Dockerfile.rocky @@ -70,11 +70,13 @@ ENV LANG C.UTF-8 FROM dev AS app +ARG CMAKE_OPTS + COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake .. && \ +RUN cmake ${CMAKE_OPTS} .. && \ make -j$(nproc) doc && \ make -j$(nproc) install && \ ldconfig diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 1217e7fa9..31a5b3db3 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -72,11 +72,13 @@ ENV LANG C.UTF-8 FROM dev AS app +ARG CMAKE_OPTS + COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake .. && \ +RUN cmake ${CMAKE_OPTS} .. && \ make -j$(nproc) doc && \ make -j$(nproc) install && \ ldconfig