From dd43559c7d5ec742db01ab23c3dafe7f5e51edc5 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 2 Feb 2020 13:28:20 +0100 Subject: [PATCH] ci: do not package EtherCAT node for now, as we are missing a RPM package for Etherlab --- .gitlab-ci.yml | 2 +- packaging/docker/Dockerfile.app | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b8548a8a..742e258f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,7 +203,7 @@ packaging:rpm: - build:fedora:x86_64 script: - mkdir -p build && cd build - - cmake .. + - cmake -DWITH_NODE_ETHERCAT=OFF .. - make ${MAKE_OPTS} doc - make ${MAKE_OPTS} package artifacts: diff --git a/packaging/docker/Dockerfile.app b/packaging/docker/Dockerfile.app index 2862203f3..81e401c0a 100644 --- a/packaging/docker/Dockerfile.app +++ b/packaging/docker/Dockerfile.app @@ -38,7 +38,7 @@ COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build -RUN cmake -DCPACK_GENERATOR=RPM .. +RUN cmake -DCPACK_GENERATOR=RPM -DWITH_NODE_ETHERCAT=OFF .. RUN make -j$(nproc) doc RUN make -j$(nproc) package