From 71086cd355b19bbcee5b53ac555b37acf5c32c8d Mon Sep 17 00:00:00 2001 From: Virgile Prevosto <virgile.prevosto@m4x.org> Date: Mon, 31 Jan 2022 18:30:25 +0100 Subject: [PATCH] [ci] preparing tests against llvm-13 --- .gitlab-ci.yml | 6 ++++++ nix/default.nix | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d604612c..a044e8ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,5 +33,11 @@ tests-on-llvm-11: stage: tests script: - nix/frama-ci.sh build -A frama-clang.on-llvm11.tests + when: manual + +tests-on-llvm-13: + stage: tests + script: + - nix/frama-ci.sh build -A frama-clang.on-llvm13.tests tags: - nix diff --git a/nix/default.nix b/nix/default.nix index 32d6548e..eeef5386 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -23,10 +23,18 @@ let frama_clang_build = why3 config detect ''; }); + pkgs = import ( + builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/ed2c99e65f4f5f4bf3bb3a3422f07fc8ec9a97ce.tar.gz"; + sha256="1bp4fkswpl7s2clxbdbff8j42dsns4ihvc5l9399v9kapxb7wx5f"; + } + ) + {}; in (frama_clang_build { llvm_version="9"; }) .extend( self: super: { on-llvm10 = (frama_clang_build { llvm_version="10"; }); on-llvm11 = (frama_clang_build { llvm_version="11"; }); + on-llvm13 = (frama_clang_build { inherit pkgs; llvm_version="13"; }); }) -- GitLab