[ci,env] add clang and nc + rebuild with clang

.gitlab-ci.yml

@@ -24,18 +24,18 @@ before_script:
   - mkdir -p ~/.ssh
   - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" >> ~/.ssh/config'
 
-# build_clang:
-#   stage: build
-#   script:
-#     - export CC=/usr/bin/clang
-#     - export CXX=/usr/bin/clang++
-#     - mkdir /builds/batsim/batsim/build
-#     - cd /builds/batsim/batsim/build
-#     - cmake .. -DCMAKE_BUILD_TYPE=Debug -Dtreat_warnings_as_errors=ON
-#     - make
-#   artifacts:
-#     paths:
-#       - /builds/batsim/batsim/build
+build_clang:
+  stage: build
+  script:
+    - export CC=/usr/bin/clang
+    - export CXX=/usr/bin/clang++
+    - mkdir /builds/batsim/batsim/build
+    - cd /builds/batsim/batsim/build
+    - cmake .. -DCMAKE_BUILD_TYPE=Debug -Dtreat_warnings_as_errors=ON
+    - make
+  artifacts:
+    paths:
+      - /builds/batsim/batsim/build
 
 build_gcc:
   stage: build
@@ -46,9 +46,6 @@ build_gcc:
     - cd /builds/batsim/batsim/build
     - cmake .. -DCMAKE_BUILD_TYPE=Debug -Dtreat_warnings_as_errors=ON
     - make
-  artifacts:
-    paths:
-      - /builds/batsim/batsim/build
 
 build_batsched:
   stage: build
@@ -93,7 +90,7 @@ test_test:
     - cd /builds/batsim/batsim/build
     - ctest --output-on-failure -E 'remote|smpi'
   dependencies:
-    - build_gcc
+    - build_clang
     - build_batsched
 
 deploy_code_doc:

environments/batsim_ci.yaml

@@ -43,20 +43,13 @@ setup:
   - "@base"
   - enable_root_ssh_login
 
-  #
-  # Simulator and schedulers install
-  #
-  #- configure_apt_repo
+  - install_ci_deps:
+    - install_build_tools:
+      - exec_in: apt-get update && apt-get -y install cmake gcc clang g++
+    - install_ci_tools:
+      - exec_in: apt-get update && apt-get -y install netcat
 
-  #  - install_common_deps:
-  #
-  #    - install_build_tools:
-  #      - exec_in: |
-  #          apt-get -y install cmake gcc clang g++
-  #          update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-6 100
-  #
   - simgrid
-
   - batsim_dependencies
   - result_analysis