ci: Merge weekly clang jobs

nsnam · Feb 21, 2024 · d60f78c · d60f78c
1 parent 2d04193
commit d60f78c
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/utils/tests/gitlab-ci-clang.yml b/utils/tests/gitlab-ci-clang.yml
@@ -7,8 +7,7 @@
 # We support CLANG versions 10 through 16
 # We test only CLANG 10 on Ubuntu 20.04 and CLANG 16 on Ubuntu 23.04
 
-.weekly-clang-ubuntu20.04:
-  image: ubuntu:20.04
+.weekly-clang-ubuntu:
   extends: .base-build
   rules:
     - if: $RELEASE == "weekly"
@@ -20,36 +19,26 @@
     - DEBIAN_FRONTEND=noninteractive apt install -y
       clang-$CLANG cmake ninja-build ccache build-essential
       libboost-all-dev
+      libeigen3-dev
       libgtk-3-0 libgtk-3-dev
       libgsl-dev $LIBGSL gsl-bin
       libsqlite3-dev sqlite3
       libxml2 libxml2-dev
       ssh
   variables:
     COMPILER: clang++-$CLANG
+
+.weekly-clang-ubuntu20.04:
+  image: ubuntu:20.04
+  extends: .weekly-clang-ubuntu
+  variables:
     LIBGSL: libgsl23
+    EXTRA_OPTIONS: --disable-eigen
 
 .weekly-clang-ubuntu23.04:
   image: ubuntu:23.04
-  extends: .base-build
-  rules:
-    - if: $RELEASE == "weekly"
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-      allow_failure: true
-  before_script:
-    - apt update
-    - apt upgrade -y
-    - DEBIAN_FRONTEND=noninteractive apt install -y
-      clang-$CLANG cmake ninja-build ccache build-essential
-      libboost-all-dev
-      libeigen3-dev
-      libgtk-3-0 libgtk-3-dev
-      libgsl-dev $LIBGSL gsl-bin
-      libsqlite3-dev sqlite3
-      libxml2 libxml2-dev
-      ssh
+  extends: .weekly-clang-ubuntu
   variables:
-    COMPILER: clang++-$CLANG
     LIBGSL: libgsl27
 
 weekly-clang: