From 8beac4a394341930324a3415ee9191b1846700c9 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 4 Mar 2022 03:36:40 -0500 Subject: [PATCH] fix CI --- fpga/.gitlab-ci.yml | 3 +-- fpga/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fpga/.gitlab-ci.yml b/fpga/.gitlab-ci.yml index a1e001387..bc3aa8b17 100644 --- a/fpga/.gitlab-ci.yml +++ b/fpga/.gitlab-ci.yml @@ -18,8 +18,7 @@ docker-dev: script: - docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} . tags: - - shell - - linux + - docker # Stage: build ############################################################################## diff --git a/fpga/Dockerfile b/fpga/Dockerfile index 3dbe52ee3..6cb5790f2 100644 --- a/fpga/Dockerfile +++ b/fpga/Dockerfile @@ -62,12 +62,13 @@ RUN yum -y install \ jansson-devel \ openssl-devel \ curl-devel \ - lapack-devel + lapack-devel \ + libuuid-devel # Build & Install Fmtlib RUN git clone --recursive https://github.com/fmtlib/fmt.git /tmp/fmt && \ mkdir -p /tmp/fmt/build && cd /tmp/fmt/build && \ - git checkout 5.2.0 && \ + git checkout 5.3.0 && \ cmake3 -DBUILD_SHARED_LIBS=1 .. && \ make -j$(nproc) install && \ rm -rf /tmp/fmt @@ -75,7 +76,7 @@ RUN git clone --recursive https://github.com/fmtlib/fmt.git /tmp/fmt && \ # Build & Install spdlog RUN git clone --recursive https://github.com/gabime/spdlog.git /tmp/spdlog && \ mkdir -p /tmp/spdlog/build && cd /tmp/spdlog/build && \ - git checkout v1.3.1 && \ + git checkout v1.6.0 && \ cmake3 -DSPDLOG_FMT_EXTERNAL=ON -DSPDLOG_BUILD_BENCH=OFF .. && \ make -j$(nproc) install && \ rm -rf /tmp/spdlog