diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8968f1d721d01296a2463213c85d7d5dce6b73d3..d1b49643d0b39c0a5181be374f9f2d2e174f7fe8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -119,6 +119,13 @@ CFP: tags: - nix +Linea-Cabs: + stage: tests + script: + - nix/frama-ci.sh build -A linea-cabs.tests + tags: + - nix + eva-tests: stage: tests script: diff --git a/nix/default.nix b/nix/default.nix index d9f8349f5d7db3034a05fff70433d66e6ed7a9e5..6c86751e7bead1dc4fb86db8ac648680528ecd5c 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -329,6 +329,7 @@ pkgs.lib.makeExtensible security_src = plugins.security.src; context_from_precondition_src = plugins.context-from-precondition.src; metacsl_src = plugins.meta.src; + linea_cabs_src = plugins.linea-cabs.src; postPatch = '' patchShebangs . ''; @@ -350,6 +351,8 @@ pkgs.lib.makeExtensible echo IN_FRAMA_CI=yes > "$sourceRoot/in_frama_ci" cp -r --preserve=mode "$context_from_precondition_src" "$sourceRoot/src/plugins/context-from-precondition" chmod -R u+w -- "$sourceRoot/src/plugins/context-from-precondition" + cp -r --preserve=mode "$linea_cabs_src" "$sourceRoot/src/plugins/linea-cabs" + chmod -R u+w -- "$sourceRoot/src/plugins/linea-cabs" cp -r --preserve=mode "$security_src" "$sourceRoot/src/plugins/security" chmod -R u+w -- "$sourceRoot/src/plugins/security" ''; diff --git a/nix/frama-ci.nix b/nix/frama-ci.nix index 8e700b2270b60cc743d8a8e06c890a88a60f7da7..09e282e99edf09d39fbe24b61574ed759db3955f 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" = "e33541f771435c6b1014acf1b042f569deadb663"; - "ref" = "master"; + "rev" = "37fae65509b51c40cf72e9f0312e45303db73c05"; + "ref" = "feature/nix/add_ci_to_linea-cabs"; }; pkgs = import "${src}/pkgs.nix" {}; in