RH-like: replace centos8 by fedora38

Oslandia · Oct 31, 2023 · 5c1f1eb · 5c1f1eb
1 parent 31f8868
commit 5c1f1eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.gitlab/pipeline/centos.yml → .gitlab/pipeline/fedora.yml b/.gitlab/pipeline/centos.yml → .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/ci/centos/before_install.sh → ci/fedora/before_install.sh b/ci/centos/before_install.sh → ci/fedora/before_install.sh