diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 083d8c3f696054c9db3385640ffda5d8e8779226..f1c30160b1e0f4d28832a05143dc89df88e33197 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,9 @@ variables: GIT_STRATEGY: clone before_script: - - opam install camlp4 - - camlp4 + - opam install camlp4 ocamlfind - eval `opam config env` - - camlp4 + - which camlp4 stages: - build @@ -24,3 +23,6 @@ test: - cd test - make test-batch +local_test: + - make + - make test-batch diff --git a/_oasis b/_oasis index 85ccb045e38f4d29ee86b6aa3ec114f58c7c5c54..9a882d991b60f9b0cf982484630fde9afb964b8d 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.25 +Version: 1.26 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 diff --git a/doc/version.tex b/doc/version.tex index 06f6c286d4f6e052e66735bd4d3dc2d58375ed54..c6631259d2453d8b22a80ff43509196055a915ba 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,4 +1,4 @@ -\newcommand{\version}{1.25} -\newcommand{\sha}{67237ef} +\newcommand{\version}{1.26} +\newcommand{\sha}{cca9022} \newcommand{\versionname}{none} \newcommand{\versiondate}{08-12-17} diff --git a/setup.ml b/setup.ml index f0534505912bf046524be6154795c2ee57c8d9ff..c9fb00efdf77dd696ab1af5aab98f69c533d407e 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: 463a243b6b026fa322a4e453fde9f9ca) *) +(* DO NOT EDIT (digest: fdce6d13a870129161e43f640f40d1e1) *) (* 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.25"; + version = "1.26"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7254,7 +7254,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = Some "j.Nk0Tip\176)n\161\n\216?\002"; + oasis_digest = Some "p\000\201\236F\230\220\184\190\184\1531YX6\131"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/src/META b/src/META index e5fbe69704b4307f560c8748445f3f22dbf5536e..74e9f5da8fca19d361167554ae2e04b8e0318ebe 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 1a5bf4765347fb967080541e0ef6676c) -version = "1.25" +# DO NOT EDIT (digest: d266f1a9a54dfb9b24c48ef40fd0401a) +version = "1.26" 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 e7487c6f69f543f419b9d9df9ff852a09ed70172..da7019ceb8a6173085bfb5abcf298b8f928a7f6e 100644 --- a/src/lutilsVersion.ml +++ b/src/lutilsVersion.ml @@ -1,2 +1,2 @@ -let str="1.25" -let sha="67237ef" +let str="1.26" +let sha="cca9022"