diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3394befbc709bec2d77dbc1603508d8c0e8f786e..d2b59ffda31d10d5693809ea9105c74c7e2564bf 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/nix/default.nix b/nix/default.nix index b7804254b581310c919738b827b0dd22a9aa0ba7..889db9e1432856b4a338ca0f8cf396f8a62d162e 100644 --- a/nix/default.nix +++ b/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" diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index 067bb0c00611b8250fb16c3f0a34a70a23ed2c86..5c52d35fae6e2828c4cae9f87e4bf27567fc1301 100644 --- a/nix/frama-ci.nix +++ b/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 {