From bf0665287fd8c7635d68156a67ee2575f9be743b Mon Sep 17 00:00:00 2001 From: "Ola Wingbrant (sssowo)" Date: Mon, 13 May 2024 12:33:45 +0200 Subject: [PATCH 1/4] Change default tricera path to assume that tri is in $PATH --- src/options_saida.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/options_saida.ml b/src/options_saida.ml index 4d5563c..d7f4789 100644 --- a/src/options_saida.ml +++ b/src/options_saida.ml @@ -44,7 +44,7 @@ module Output_file = Self.String module Tricera_path = Self.String (struct let option_name = "-saida-tricera-path" - let default = "~/Documents/tricera/tri" + let default = "tri" let arg_name = "output_file" let help = "Sets the path to the TriCera executable" end) From 8ddaf2a9d901545618d02fe235a529ee33551d51 Mon Sep 17 00:00:00 2001 From: "Ola Wingbrant (sssowo)" Date: Mon, 13 May 2024 12:51:00 +0200 Subject: [PATCH 2/4] Bump version numbers in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 827dff6..1e21668 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This program is licensed under the GPL2 license, see license headers in source c and the full license in the LICENSE file. ACSL Contract inference for helper functions. -Developed for Frama-C v23.1 but also seems to work for v24. +Developed for Frama-C v23.1 but also seems to work for Frama-C versions <= 28.1. Please note that the plugin is experimental and still under development so that no results are guaranteed. From 5408488823a752b6318157a2d2774ed2e109b13c Mon Sep 17 00:00:00 2001 From: "Ola Wingbrant (sssowo)" Date: Mon, 13 May 2024 15:02:08 +0200 Subject: [PATCH 3/4] Add dependencies in workflow file --- .github/workflows/build.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6caeda6..33acb30 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,10 @@ jobs: uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - - run: opam install . --deps-only --with-test - - run: opam exec -- dune build - - run: opam exec -- dune runtest + - run: | + sudo apt-get update + sudo apt-get install graphviz libgtk-3-dev libgtksourceview-3.0-dev + - run: | + opam install . --deps-only --with-test + opam exec -- dune build + opam exec -- dune runtest From f7984378104ec84f537b278a5e783d4fff98fa94 Mon Sep 17 00:00:00 2001 From: "Ola Wingbrant (sssowo)" Date: Mon, 13 May 2024 15:50:24 +0200 Subject: [PATCH 4/4] Add dependencies early --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33acb30..bff92a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,15 +24,15 @@ jobs: runs-on: ${{ matrix.os }} steps: + - run: | + sudo apt-get update + sudo apt-get install -q -y graphviz libgtk-3-dev libgtksourceview-3.0-dev - name: Checkout tree uses: actions/checkout@v4 - name: Set-up OCaml ${{ matrix.ocaml-compiler }} uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - - run: | - sudo apt-get update - sudo apt-get install graphviz libgtk-3-dev libgtksourceview-3.0-dev - run: | opam install . --deps-only --with-test opam exec -- dune build