Skip to content

Commit

Permalink
RH-like: replace centos8 by fedora38
Browse files Browse the repository at this point in the history
  • Loading branch information
lbartoletti committed Oct 31, 2023
1 parent 31f8868 commit 59e9a41
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
16 changes: 6 additions & 10 deletions .gitlab/pipeline/centos.yml → .gitlab/pipeline/fedora.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/pipeline/test-code.yml
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.

0 comments on commit 59e9a41

Please sign in to comment.