From 6257b2244ac37c53b6bf43dcebc9f50294f48177 Mon Sep 17 00:00:00 2001 From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr> Date: Fri, 8 Dec 2017 18:49:51 +0100 Subject: [PATCH] fix the CI script: ok, remove the local stage for now --- .gitlab-ci.yml | 7 ------- _oasis | 2 +- doc/version.tex | 4 ++-- setup.ml | 6 +++--- src/META | 4 ++-- src/lutilsVersion.ml | 4 ++-- 6 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd023aa..e3c6fb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,10 +21,3 @@ test: - cd test - make test-batch -local_test: - stage: deploy - script: - - make - - make install - - ls -l ../_build/src/gnuplotRifMain.native - - make test-batch diff --git a/_oasis b/_oasis index 75e6dfe..f0898cc 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lutils -Version: 1.29 +Version: 1.30 Authors: Erwan Jahier Maintainers: erwan.jahier@imag.fr License: GPL-3 diff --git a/doc/version.tex b/doc/version.tex index f10329c..88d58e1 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,4 +1,4 @@ -\newcommand{\version}{1.29} -\newcommand{\sha}{7bb27a3} +\newcommand{\version}{1.30} +\newcommand{\sha}{1e6ac97} \newcommand{\versionname}{none} \newcommand{\versiondate}{08-12-17} diff --git a/setup.ml b/setup.ml index 8de16c2..c5d552c 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: 7997b790922194a50794e0b4228c8bc2) *) +(* DO NOT EDIT (digest: 6efc8ad9d704127f95ee31e9f91f71c6) *) (* 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.29"; + version = "1.30"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7254,7 +7254,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.10"; - oasis_digest = Some "\134_n\132_\148TAS\128\231\247F&\022B"; + oasis_digest = Some "\163}9|\022\1773\173\227\014\214\173B\185\205\154"; oasis_exec = None; oasis_setup_args = []; setup_update = false diff --git a/src/META b/src/META index 1d4c81f..fada227 100644 --- a/src/META +++ b/src/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: e198011d6cd0be22ad077bc21eeeb5f7) -version = "1.29" +# DO NOT EDIT (digest: 03e3c3ffeddaf5bf68d8b35acaf7389a) +version = "1.30" 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 3d49740..b117865 100644 --- a/src/lutilsVersion.ml +++ b/src/lutilsVersion.ml @@ -1,2 +1,2 @@ -let str="1.29" -let sha="7bb27a3" +let str="1.30" +let sha="1e6ac97" -- GitLab