From aeef31219dff3c4b8b6a6b6618526b7df3ad4d33 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 11 Dec 2017 22:23:29 +0100
Subject: [PATCH] ok, merge build and test in the yaml.
---
.gitlab-ci.yml | 15 +++------------
_oasis | 2 +-
doc/version.tex | 4 ++--
setup.ml | 6 +++---
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
6 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36db3c5..75e4a0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,24 +5,15 @@ variables:
stages:
- - build
- test
-build:
- stage: build
+build_and_test:
+ stage: test
script:
- opam install camlp4 ocamlfind
- make
- make install
- - find /home/opam/.opam/4.05.0/ -name gnuplot-rif -print
- cache:
- paths:
- - /home/opam/.opam/4.05.0/bin
-
-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 8c13d5f..d828120 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.37
+Version: 1.38
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: GPL-3
diff --git a/doc/version.tex b/doc/version.tex
index f9e0c71..fcc49bf 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.37}
-\newcommand{\sha}{a31f8df}
+\newcommand{\version}{1.38}
+\newcommand{\sha}{e94b9cd}
\newcommand{\versionname}{none}
\newcommand{\versiondate}{11-12-17}
diff --git a/setup.ml b/setup.ml
index b81da0d..52088af 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: 7820e79ab021bdca2cc9e2e413224b2d) *)
+(* DO NOT EDIT (digest: 39a7c86766a193da3117703620507963) *)
(*
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.37";
+ version = "1.38";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -7254,7 +7254,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.10";
- oasis_digest = Some "\217\238}\"\227]M \020A\196\rM\187\025\185";
+ oasis_digest = Some "#\238\2012\248]\174\023l\205\128\194\172\195so";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
diff --git a/src/META b/src/META
index ae9b7d9..826820f 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 0f8a018116cdc336ef2713b75c31f049)
-version = "1.37"
+# DO NOT EDIT (digest: 85b8e62029a26e3cdc1006d2d85f37b4)
+version = "1.38"
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 ee70492..15edd41 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.37"
-let sha="a31f8df"
+let str="1.38"
+let sha="e94b9cd"
--
GitLab