Commit 23563183 authored by Fabio Luchetti's avatar Fabio Luchetti
Browse files

SPEC/CI: Fix el-8 build: use cmake 3.17.3 and update libarchive

parent e3a56f19
Pipeline #2906008 failed with stages
in 25 minutes and 58 seconds
......@@ -18,6 +18,7 @@ deps-el-7:
paths:
- "$CI_JOB_NAME"
# @note update libarchive or face https://github.com/ComplianceAsCode/content/issues/7016
deps-el-8:
stage: deps
image: gitlab-registry.cern.ch/linuxsupport/c8-base
......@@ -26,6 +27,7 @@ deps-el-8:
- dnf builddep -y eos-folly-deps.spec
- mkdir -p ~/rpmbuild/SOURCES
- cp SConstruct.double-conversion ~/rpmbuild/SOURCES
- dnf update libarchive
- rpmbuild -ba --undefine=_disable_source_fetch eos-folly-deps.spec
- mkdir "$CI_JOB_NAME"
- cp -r /root/rpmbuild/RPMS/ /root/rpmbuild/SRPMS/ "$CI_JOB_NAME"
......
......@@ -72,7 +72,7 @@ export CXXFLAGS='-g3 -fPIC'
%endif
# @note EOS-4450
%if 0%{?fedora} >= 33
%if 0%{?fedora} >= 33 || 0%{distribution} == 8
export TMP="/tmp/"
echo "Installing and using cmake 3.17.3"
curl --location https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3-Linux-x86_64.sh --output $TMP/cmake-3.17.3-Linux-x86_64.sh
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment