From 42a7e298c05f83d6574d0ab314bcc1686799b1dc Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 9 Sep 2021 17:59:44 +0200 Subject: [PATCH] ci: Update build environments --- Jenkinsfile | 4 ++-- test/ci/fedora.32.def | 3 ++- test/ci/fedora.33.def | 3 ++- test/ci/fedora.34.def | 4 ++-- test/ci/ubuntu.20.04.def | 24 ++++++------------------ 5 files changed, 14 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3eabd606..f5cdb6fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -89,7 +89,7 @@ pipeline{ stage("CI") { steps{ script { - def all = '-DHAS_ASIO=ON -DHAS_DDS=ON -DHAS_PMIX=ON' + def all = '-DHAS_ASIO=ON -DHAS_ASIOFI=ON -DHAS_PMIX=ON' def builds = jobMatrix('build', [ [os: 'ubuntu', ver: '20.04', arch: 'x86_64', compiler: 'gcc-9', extra: all], @@ -97,7 +97,7 @@ pipeline{ [os: 'fedora', ver: '33', arch: 'x86_64', compiler: 'gcc-10', extra: all], [os: 'fedora', ver: '34', arch: 'x86_64', compiler: 'gcc-11', extra: all], [os: 'macos', ver: '11', arch: 'x86_64', compiler: 'apple-clang-12', - extra: '-DHAS_ASIO=ON -DHAS_DDS=ON'], + extra: '-DHAS_ASIO=ON'], ]) def all_debug = "${all} -DCMAKE_BUILD_TYPE=Debug" diff --git a/test/ci/fedora.32.def b/test/ci/fedora.32.def index 1f4a8aef..9b7f384e 100644 --- a/test/ci/fedora.32.def +++ b/test/ci/fedora.32.def @@ -4,5 +4,6 @@ From: fedora:32 %post dnf -y update dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-32-x86_64/fairsoft-release-dev.rpm - dnf -y install git boost-devel cmake gcc-c++ dds-devel fairlogger-devel faircmakemodules asio-devel flatbuffers-devel zeromq-devel asiofi-devel cli11-devel pmix-devel ninja-build + dnf -y install cli11-devel pmix-devel ninja-build 'dnf-command(builddep)' + dnf -y builddep fairmq dnf -y clean all diff --git a/test/ci/fedora.33.def b/test/ci/fedora.33.def index 180d180e..ed842c27 100644 --- a/test/ci/fedora.33.def +++ b/test/ci/fedora.33.def @@ -4,5 +4,6 @@ From: fedora:33 %post dnf -y update dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-33-x86_64/fairsoft-release-dev.rpm - dnf -y install git boost-devel cmake gcc-c++ dds-devel fairlogger-devel faircmakemodules asio-devel flatbuffers-devel zeromq-devel asiofi-devel cli11-devel pmix-devel ninja-build + dnf -y install cli11-devel pmix-devel ninja-build 'dnf-command(builddep)' + dnf -y builddep fairmq dnf -y clean all diff --git a/test/ci/fedora.34.def b/test/ci/fedora.34.def index 7602238c..24eb9f3f 100644 --- a/test/ci/fedora.34.def +++ b/test/ci/fedora.34.def @@ -4,6 +4,6 @@ From: fedora:34 %post dnf -y update dnf -y install https://alfa-ci.gsi.de/packages/rpm/fedora-34-x86_64/fairsoft-release-dev.rpm - dnf -y install git boost-devel cmake gcc-c++ dds-devel fairlogger-devel faircmakemodules asio-devel flatbuffers-devel zeromq-devel asiofi-devel cli11-devel pmix-devel ninja-build - dnf -y install libasan liblsan libtsan libubsan clang-tools-extra + dnf -y install cli11-devel pmix-devel ninja-build 'dnf-command(builddep)' libasan liblsan libtsan libubsan clang-tools-extra + dnf -y builddep fairmq dnf -y clean all diff --git a/test/ci/ubuntu.20.04.def b/test/ci/ubuntu.20.04.def index 95223c69..8408a9e8 100644 --- a/test/ci/ubuntu.20.04.def +++ b/test/ci/ubuntu.20.04.def @@ -10,20 +10,20 @@ From: ubuntu:20.04 cd /tmp - git clone -b v1.18.1 --recurse-submodules https://github.com/FairRootGroup/asio + git clone -b v1.19.2 --recurse-submodules https://github.com/FairRootGroup/asio cmake -GNinja -S asio -B asio_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release cmake --build asio_build --target install rm -rf asio asio_build - git clone -b v0.2.0 https://github.com/FairRootGroup/FairCMakeModules + git clone -b v1.0.0 https://github.com/FairRootGroup/FairCMakeModules cmake -GNinja -S FairCMakeModules -B FairCMakeModules_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release cmake --build FairCMakeModules_build --target install rm -rf FairCMakeModules FairCMakeModules_build - # git clone -b v0.5.0 --recurse-submodules https://github.com/FairRootGroup/asiofi - # cmake -GNinja -S asiofi -B asiofi_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - # cmake --build asiofi_build --target install - # rm -rf asiofi asiofi_build + git clone -b v0.5.1 --recurse-submodules https://github.com/FairRootGroup/asiofi + cmake -GNinja -S asiofi -B asiofi_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + cmake --build asiofi_build --target install + rm -rf asiofi asiofi_build git clone -b v1.12.1 https://github.com/google/flatbuffers cmake -GNinja -S flatbuffers -B flatbuffers_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON @@ -34,15 +34,3 @@ From: ubuntu:20.04 cmake -GNinja -S FairLogger -B FairLogger_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_EXTERNAL_FMT=ON cmake --build FairLogger_build --target install rm -rf FairLogger FairLogger_build - - git clone -b 3.5.14 https://github.com/FairRootGroup/DDS - cd DDS - wget https://git.gsi.de/SDE/packages/dds/-/raw/f33f1a6a95eecbfebc6042af382fcf2d3128ba15/fix_install_destinations.patch - wget https://git.gsi.de/SDE/packages/dds/-/raw/f33f1a6a95eecbfebc6042af382fcf2d3128ba15/strip_etc_version.patch - patch -p1 < fix_install_destinations.patch - patch -p1 < strip_etc_version.patch - cd .. - cmake -GNinja -S DDS -B DDS_build -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_dds-octopus=OFF -DBUILD_dds-tutorials=OFF -DBUILD_dds-test=OFF - cmake --build DDS_build --target wn_bin - cmake --build DDS_build --target install - rm -rf DDS DDS_build