From 1fbbf1c43bb740209aca458fb384be25d1111d0f Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 11 Dec 2017 22:34:18 +0100
Subject: [PATCH] Add a job to test the opam-test package
---
.gitlab-ci.yml | 10 ++++++++--
_oasis | 2 +-
doc/version.tex | 4 ++--
setup.ml | 6 +++---
src/META | 4 ++--
src/lutilsVersion.ml | 4 ++--
6 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 75e4a0a..70599fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,11 @@ variables:
stages:
+ - build
- test
build_and_test:
- stage: test
+ stage: build
script:
- opam install camlp4 ocamlfind
- make
@@ -16,4 +17,9 @@ build_and_test:
- cd test
- make test-batch
-
+test_opam_test:
+ stage: test
+ script:
+ - opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
+ - opam update
+ - opam install lutils
diff --git a/_oasis b/_oasis
index d828120..c4f5c52 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: lutils
-Version: 1.38
+Version: 1.39
Authors: Erwan Jahier
Maintainers: erwan.jahier@imag.fr
License: GPL-3
diff --git a/doc/version.tex b/doc/version.tex
index fcc49bf..c9c2514 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.38}
-\newcommand{\sha}{e94b9cd}
+\newcommand{\version}{1.39}
+\newcommand{\sha}{aeef312}
\newcommand{\versionname}{none}
\newcommand{\versiondate}{11-12-17}
diff --git a/setup.ml b/setup.ml
index 52088af..ace49ad 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: 39a7c86766a193da3117703620507963) *)
+(* DO NOT EDIT (digest: 55e2fab71c23ab028d9f3a423aac5aa5) *)
(*
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.38";
+ version = "1.39";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
@@ -7254,7 +7254,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.10";
- oasis_digest = Some "#\238\2012\248]\174\023l\205\128\194\172\195so";
+ oasis_digest = Some "\219w\220\146Qp\241\205\2307)I\241\168\209\198";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
diff --git a/src/META b/src/META
index 826820f..070fea4 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
# OASIS_START
-# DO NOT EDIT (digest: 85b8e62029a26e3cdc1006d2d85f37b4)
-version = "1.38"
+# DO NOT EDIT (digest: 2f93171c7d10f868c35f4bc99fd16e2b)
+version = "1.39"
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 15edd41..8ea5ab3 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.38"
-let sha="e94b9cd"
+let str="1.39"
+let sha="aeef312"
--
GitLab