Merge branch 'feature/frama-clang-ci' into 'master'

Update Frama-CI data

See merge request frama-c/frama-c!2785

.gitlab-ci.yml

@@ -64,6 +64,13 @@ genassigns:
   tags:
    - nix
 
+frama-clang:
+  stage: tests
+  script:
+   - nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/0c0fe6d85b92c4e992e314bd6f9943413af9a309.tar.gz -p nix --run "nix/frama-ci.sh build -A frama-clang.tests"
+  tags:
+   - nix
+
 counter-examples:
   stage: tests
   script:

nix/default.nix

@@ -218,6 +218,7 @@ rec {
         ];
         counter_examples_src = plugins.counter-examples.src;
         genassigns_src = plugins.genassigns.src;
+        frama-clang_src = plugins.frama-clang.src;
         pathcrawler_src = plugins.pathcrawler.src;
         mthread_src = plugins.mthread.src;
         caveat_importer_src = plugins.caveat-importer.src;
@@ -233,6 +234,8 @@ rec {
            chmod -R u+w -- "$sourceRoot/src/plugins/counter-examples"
            cp -r --preserve=mode "$genassigns_src" "$sourceRoot/src/plugins/genassigns"
            chmod -R u+w -- "$sourceRoot/src/plugins/genassigns"
+           cp -r --preserve=mode "frama-clang_src" "$sourceRoot/src/plugins/frama-clang"
+           chmod -R u+w -- "$sourceRoot/src/plugins/frama-clang"
            cp -r --preserve=mode "$pathcrawler_src" "$sourceRoot/src/plugins/pathcrawler"
            chmod -R u+w -- "$sourceRoot/src/plugins/pathcrawler"
            cp -r --preserve=mode "$mthread_src" "$sourceRoot/src/plugins/mthread"

nix/frama-ci.nix

@@ -5,8 +5,8 @@ let
     src = builtins.fetchGit {
             "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
             "name" = "Frama-CI";
-            "rev" = "0dad15724fe9fa0782e8797f996d9a996a68ae65";
-            "ref" = "master";
+            "rev" = "ccd253f6f63812451cf6ce13a5b9e60c0f914829";
+            "ref" = "feature/frama-clang-ci";
     };
  in
  {