xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade centos:8 to centos-stream (#2066)

Browse Source 
* Upgrade from CentOS-8 to CentOS Stream

* Drop ccache and python from dependencies

Co-authored-by: Luis Díaz Más <luis.diaz.ld2@roche.com>
main
Luis Díaz Más 3 years ago committed by GitHub
parent 55712d489e
commit 5e9e31f1a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
.github/workflows/nightly_Linux_distributions.yml vendored
Unescape Escape View File

@ -14,8 +14,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
# arch suffering this issue: https://github.com/abseil/abseil-cpp/issues/709 # arch suffering this issue: https://github.com/abseil/abseil-cpp/issues/709
# centos:8 had linking issues with gtest container_image: ["fedora:latest", "debian:10", "archlinux:base", "ubuntu:20.04", "tgagor/centos-stream:2.0.11", "alpine:3.13"]
container_image: ["fedora:latest", "debian:10", "archlinux:base", "ubuntu:20.04", "centos:8", "alpine:3.13"]
compiler: [g++, clang++] compiler: [g++, clang++]
build_type: [Release, Debug] build_type: [Release, Debug]
shared_libraries: [ON, OFF] shared_libraries: [ON, OFF]

20
ci/install_dependencies.sh
Unescape Escape View File

@ -30,43 +30,39 @@ distro_id=$(grep '^ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g')
case "$distro_id" in case "$distro_id" in
'fedora') 'fedora')
dnf -y --refresh install gcc-c++ clang cmake make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which dos2unix glibc-langpack-en diffutils dnf -y --refresh install gcc-c++ clang cmake make expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which dos2unix glibc-langpack-en diffutils
;; ;;
'debian') 'debian')
apt-get update apt-get update
apt-get install -y cmake g++ clang make ccache python3 libexpat1-dev zlib1g-dev libssh-dev libcurl4-openssl-dev libgtest-dev libxml2-utils apt-get install -y cmake g++ clang make libexpat1-dev zlib1g-dev libssh-dev libcurl4-openssl-dev libgtest-dev libxml2-utils
debian_build_gtest debian_build_gtest
;; ;;
'arch') 'arch')
pacman --noconfirm -Syu pacman --noconfirm -Syu
pacman --noconfirm -S gcc clang cmake make ccache expat zlib libssh curl gtest python dos2unix which diffutils pacman --noconfirm -S gcc clang cmake make expat zlib libssh curl gtest dos2unix which diffutils
;; ;;
'ubuntu') 'ubuntu')
apt-get update apt-get update
apt-get install -y cmake g++ clang make ccache python3 libexpat1-dev zlib1g-dev libssh-dev libcurl4-openssl-dev libgtest-dev google-mock libxml2-utils apt-get install -y cmake g++ clang make libexpat1-dev zlib1g-dev libssh-dev libcurl4-openssl-dev libgtest-dev google-mock libxml2-utils
debian_build_gtest debian_build_gtest
;; ;;
'alpine') 'alpine')
apk update apk update
apk add gcc g++ clang cmake make ccache expat-dev zlib-dev libssh-dev curl-dev gtest gtest-dev gmock libintl gettext-dev which dos2unix bash libxml2-utils diffutils python3 apk add gcc g++ clang cmake make expat-dev zlib-dev libssh-dev curl-dev gtest gtest-dev gmock libintl gettext-dev which dos2unix bash libxml2-utils diffutils
;; ;;
'centos'|'rhel') 'centos'|'rhel')
yum -y update libarchive # workaround for https://bugs.centos.org/view.php?id=18212 dnf clean all
yum -y install epel-release dnf -y install gcc-c++ clang cmake make expat-devel zlib-devel libssh-devel libcurl-devel which dos2unix
# enable copr for gtest
curl https://copr.fedorainfracloud.org/coprs/defolos/devel/repo/epel-7/defolos-devel-epel-7.repo > /etc/yum.repos.d/_copr_defolos-devel.repo
yum clean all
yum -y install gcc-c++ clang cmake make ccache expat-devel zlib-devel libssh-devel libcurl-devel gtest-devel which python3 dos2unix
;; ;;
'opensuse-tumbleweed') 'opensuse-tumbleweed')
zypper --non-interactive refresh zypper --non-interactive refresh
zypper --non-interactive install gcc-c++ clang cmake make ccache libexpat-devel zlib-devel libssh-devel curl libcurl-devel git which dos2unix libxml2-tools zypper --non-interactive install gcc-c++ clang cmake make libexpat-devel zlib-devel libssh-devel curl libcurl-devel git which dos2unix libxml2-tools
pushd /tmp pushd /tmp
curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz curl -LO https://github.com/google/googletest/archive/release-1.8.0.tar.gz
tar xzf release-1.8.0.tar.gz tar xzf release-1.8.0.tar.gz

Write Preview
Loading…
Cancel
Save