diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1c60fb6e59ffb28bedd27f45083022fa27526eb..083d8c3f696054c9db3385640ffda5d8e8779226 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,10 @@ variables: before_script: - opam install camlp4 - + - camlp4 + - eval `opam config env` + - camlp4 + stages: - build - test diff --git a/_oasis b/_oasis index 24d248cdc3dea471a582406cba2897371a7b28d4..85ccb045e38f4d29ee86b6aa3ec114f58c7c5c54 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.24 +Version: 1.25 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 diff --git a/doc/version.tex b/doc/version.tex index 4f016587b6d63268aac4ead9342e6424e3152f06..06f6c286d4f6e052e66735bd4d3dc2d58375ed54 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,4 +1,4 @@ -\newcommand{\version}{1.24} -\newcommand{\sha}{16a2ba6} +\newcommand{\version}{1.25} +\newcommand{\sha}{67237ef} \newcommand{\versionname}{none} \newcommand{\versiondate}{08-12-17} diff --git a/setup.ml b/setup.ml index 6f9a4b9ef7ffb61e19753112628d44abcf3dcd36..f0534505912bf046524be6154795c2ee57c8d9ff 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: 28b9abfa9d2f2c68768829212e0e2dca) *) +(* DO NOT EDIT (digest: 463a243b6b026fa322a4e453fde9f9ca) *) (* 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.24"; + version = "1.25"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7254,7 +7254,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = Some "y[\192#\197\148\244\195zj\022\174\001\212<\206"; + oasis_digest = Some "j.Nk0Tip\176)n\161\n\216?\002"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/src/META b/src/META index f336fbf855d1116acc8c36d893105e33f0028703..e5fbe69704b4307f560c8748445f3f22dbf5536e 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 60185ee33b0145bf3f9ab3e2f919d246) -version = "1.24" +# DO NOT EDIT (digest: 1a5bf4765347fb967080541e0ef6676c) +version = "1.25" 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 37628a6157a80bdfd644bf01451662419595e188..e7487c6f69f543f419b9d9df9ff852a09ed70172 100644 --- a/src/lutilsVersion.ml +++ b/src/lutilsVersion.ml @@ -1,2 +1,2 @@ -let str="1.24" -let sha="16a2ba6" +let str="1.25" +let sha="67237ef"