Revert "feat(ci): Bump CGAL versions to 5.6.2 and 6.0.1"

This reverts commit 53019a7.
Oslandia · Oct 25, 2024 · 4cddb88 · 4cddb88
1 parent f29b0d6
commit 4cddb88
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -10,7 +10,7 @@ task:
     - pkg install -y cgal gmp mpfr boost-libs cmake ninja
 
   build_script:
-    - export CGAL_VERSION=6.0.1
+    - export CGAL_VERSION=6.0
     - fetch "https://github.com/CGAL/cgal/releases/download/v${CGAL_VERSION}/CGAL-${CGAL_VERSION}.tar.xz" -o CGAL-${CGAL_VERSION}.tar.xz
     - tar xJf CGAL-${CGAL_VERSION}.tar.xz
     - cmake -GNinja -S . -B build -DSFCGAL_BUILD_TESTS=ON -DCGAL_DIR=CGAL-${CGAL_VERSION}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -53,7 +53,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-          sudo ./ci/debian/before_install.sh 6.0.1
+          sudo ./ci/debian/before_install.sh 6.0
 
     - name: Build
       run: |

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
   - .post
 
 variables:
-  CGAL_LATEST_VERSION: "6.0.1"
+  CGAL_LATEST_VERSION: "6.0"
   SONAR_CGAL_VERSION: ${CGAL_LATEST_VERSION}
   DOCKER_CGAL_VERSION: ${CGAL_LATEST_VERSION}
   PYTHON_DOCKER_IMAGE: python:3.12-slim-bookworm

diff --git a/.gitlab/pipeline/debian.yml b/.gitlab/pipeline/debian.yml
@@ -12,7 +12,7 @@ debian_testing_gcc:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6.2", "6.0.1"]
+      - CGAL_VERSION: ["5.6.1", "6.0"]
 
 debian_stable_gcc:
   stage: test
@@ -28,7 +28,7 @@ debian_stable_gcc:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6.2", "6.0.1"]
+      - CGAL_VERSION: ["5.6.1", "6.0"]
 
 debian_testing_clang:
   stage: test
@@ -44,7 +44,7 @@ debian_testing_clang:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6.2", "6.0.1"]
+      - CGAL_VERSION: ["5.6.1", "6.0"]
 
 debian_stable_clang:
   stage: test
@@ -60,4 +60,4 @@ debian_stable_clang:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6.2", "6.0.1"]
+      - CGAL_VERSION: ["5.6.1", "6.0"]
diff --git a/.gitlab/pipeline/fedora.yml b/.gitlab/pipeline/fedora.yml
@@ -12,7 +12,7 @@ fedora40_clang:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6.2", "6.0.1"]
+      - CGAL_VERSION: ["5.6.1", "6.0"]
 
 fedora40_gcc:
   stage: test
@@ -28,4 +28,4 @@ fedora40_gcc:
     - ctest -VV
   parallel:
     matrix:
-      - CGAL_VERSION: ["5.6.2", "6.0.1"]
+      - CGAL_VERSION: ["5.6.1", "6.0"]