From 25bc3615f48e4df50ccce116b4131aaf2a3a7ebc Mon Sep 17 00:00:00 2001 From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr> Date: Mon, 11 Dec 2017 21:42:16 +0100 Subject: [PATCH] Try to understand why the cip works locally (gitlab-runner exec docker) and fails remotely --- .gitlab-ci.yml | 2 ++ _oasis | 2 +- doc/version.tex | 6 +++--- setup.ml | 6 +++--- src/META | 4 ++-- src/lutilsVersion.ml | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3c6fb5..762f06f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,10 +14,12 @@ build: - opam install camlp4 ocamlfind - make - make install + - find /home/opam/.opam/4.05.0/ -name gnuplot-rif -print test: stage: test script: + - find /home/opam/.opam/4.05.0/ -name gnuplot-rif -print - cd test - make test-batch diff --git a/_oasis b/_oasis index a141e03..bb1fdee 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.33 +Version: 1.34 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 diff --git a/doc/version.tex b/doc/version.tex index b0a5bff..c168c40 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,4 +1,4 @@ -\newcommand{\version}{1.33} -\newcommand{\sha}{a84de47} +\newcommand{\version}{1.34} +\newcommand{\sha}{30abd69} \newcommand{\versionname}{none} -\newcommand{\versiondate}{10-12-17} +\newcommand{\versiondate}{11-12-17} diff --git a/setup.ml b/setup.ml index 41274cd..d2a8a27 100644 --- a/setup.ml +++ b/setup.ml @@ -1,7 +1,7 @@ (* setup.ml generated for the first time by OASIS v0.4.10 *) (* OASIS_START *) -(* DO NOT EDIT (digest: 09310b26b4875273106f22c8c547cd96) *) +(* DO NOT EDIT (digest: 0081447a51f21c84983c857d66d89a24) *) (* Regenerated by OASIS v0.4.10 Visit http://oasis.forge.ocamlcore.org for more information and @@ -6855,7 +6855,7 @@ let setup_t = { oasis_version = "0.4"; ocaml_version = None; - version = "1.33"; + version = "1.34"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7254,7 +7254,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = Some "\192I\191,x\134\144K\0172\2069\148?\152["; + oasis_digest = Some "Z\028a\186\166\232\2393QF\169F\229\137)\240"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/src/META b/src/META index 29c8ab8..333ecbe 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 2134e8ca3fe0aea64f65c6dc74542b54) -version = "1.33" +# DO NOT EDIT (digest: 75996833ef4f8620c07a47e6b9a7ce4d) +version = "1.34" description = "shared by Verimag/synchronous tools (lustre, lutin, rdbg)." requires = "unix str camlp4 num" archive(byte) = "lutils.cma" diff --git a/src/lutilsVersion.ml b/src/lutilsVersion.ml index 7bf41df..44f5d8d 100644 --- a/src/lutilsVersion.ml +++ b/src/lutilsVersion.ml @@ -1,2 +1,2 @@ -let str="1.33" -let sha="a84de47" +let str="1.34" +let sha="30abd69" -- GitLab