Commit f234aa4b authored by François Bobot's avatar François Bobot
Browse files

Merge branch 'feature/opam2' into 'master'

Update Frama-CI data

See merge request frama-c/e-acsl!294
parents ab0db3a3 f39f87cf
...@@ -5,8 +5,8 @@ let ...@@ -5,8 +5,8 @@ let
src = builtins.fetchGit { src = builtins.fetchGit {
"url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git"; "url" = "https://bobot:${password}@git.frama-c.com/frama-c/Frama-CI.git";
"name" = "Frama-CI"; "name" = "Frama-CI";
"rev" = "70045f4252e668e0facad12d7db2c6ab83fc813b"; "rev" = "cea0f2d2872e59fd3e6fe4634891a3765c7036e8";
"ref" = "master"; "ref" = "feature/opam2";
}; };
in in
{ {
......
...@@ -4,7 +4,7 @@ DIR=$(dirname $0) ...@@ -4,7 +4,7 @@ DIR=$(dirname $0)
export FRAMA_CI_NIX=$DIR/frama-ci.nix export FRAMA_CI_NIX=$DIR/frama-ci.nix
export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixpkgs> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath") export FRAMA_CI=$(nix-instantiate --eval -E "((import <nixos-19.03> {}).callPackage $FRAMA_CI_NIX { password = \"$TOKEN_FOR_API\";}).src.outPath")
FRAMA_CI=${FRAMA_CI#\"} FRAMA_CI=${FRAMA_CI#\"}
FRAMA_CI=${FRAMA_CI%\"} FRAMA_CI=${FRAMA_CI%\"}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment