From 4ce9cf1f0d00065c534be8de63f4ab5d81b4c727 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Fri, 8 Dec 2017 18:25:12 +0100
Subject: [PATCH] fix the CI script: it also requires an opam version of
ocamlfind
---
.gitlab-ci.yml | 8 +++++---
_oasis | 2 +-
doc/version.tex | 4 ++--
setup.ml | 6 +++---
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 083d8c3..f1c3016 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 85ccb04..9a882d9 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 06f6c28..c663125 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 f053450..c9fb00e 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 e5fbe69..74e9f5d 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 e7487c6..da7019c 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"
--
GitLab