diff --git a/.gitlab/pipeline/centos.yml b/.gitlab/pipeline/fedora.yml similarity index 55% rename from .gitlab/pipeline/centos.yml rename to .gitlab/pipeline/fedora.yml index f0447bbd..3b50cfa1 100644 --- a/.gitlab/pipeline/centos.yml +++ b/.gitlab/pipeline/fedora.yml @@ -1,13 +1,11 @@ -centos8_clang: +fedora38_clang: stage: test - image: centos:centos8 + image: fedora:38 script: - - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* - - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* - yum update -qy - yum install -y sudo wget clang - - ./ci/centos/before_install.sh $CGAL_VERSION + - ./ci/fedora/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-$CGAL_VERSION - make @@ -16,16 +14,14 @@ centos8_clang: matrix: - CGAL_VERSION: ["5.6"] -centos8_gcc: +fedora38_gcc: stage: test - image: centos:centos8 + image: fedora:38 script: - - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-Linux-* - - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-Linux-* - yum update -qy - yum install -y sudo wget gcc-c++ - - ./ci/centos/before_install.sh $CGAL_VERSION + - ./ci/fedora/before_install.sh $CGAL_VERSION - cd $CI_PROJECT_DIR - cmake -DSFCGAL_BUILD_TESTS=ON -DCMAKE_C_COMPILER=/usr/bin/gcc -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCGAL_DIR=$CI_PROJECT_DIR/CGAL-$CGAL_VERSION - make diff --git a/.gitlab/pipeline/test-code.yml b/.gitlab/pipeline/test-code.yml index db31a709..fc3cf082 100644 --- a/.gitlab/pipeline/test-code.yml +++ b/.gitlab/pipeline/test-code.yml @@ -1,4 +1,4 @@ include: - local: /.gitlab/pipeline/opensuse.yml - - local: /.gitlab/pipeline/centos.yml + - local: /.gitlab/pipeline/fedora.yml - local: /.gitlab/pipeline/debian.yml diff --git a/ci/centos/before_install.sh b/ci/fedora/before_install.sh similarity index 100% rename from ci/centos/before_install.sh rename to ci/fedora/before_install.sh