diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7d1f4c283820753553a8a24eccf363d0411046e..730ba51a3a80091dcc62c2108175ff4cb1d234b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ variables:
   GIT_STRATEGY: clone
 
 
-stage:
+stages:
   - build
   - test
 
diff --git a/Makefile.dev b/Makefile.dev
index 074e92ab68c827fc4090dc226ad54e1acc4a3e01..b7d546b358221a9a506898a1d00871faad15b39d 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -1,15 +1,18 @@
 #######################################################################################
 # Workflow:
 # C=git commit ;  A=git amend ; U=update_version ; P=opam pack
-# to make sure the sha and the version are good, one should never
-# do U and then A.
-# to avoid such problems, legal trace are defined by this automata:
+# - to make sure the sha and the version are good, one should never
+#   do U and then A.
+# - to make sure gtit is not confused, one should never do A and the P
+#
+# thereforeto avoid such problems, legal trace are defined by this automata:
 # 0 -C-> 1
-# 1 -P-> 1
 # 1 -A-> 1
+# 1 -P-> 2
+# 2 -U-> 0
 # 1 -U-> 0
 # to implement such a workflow, C puts a lock (state 1) and U removes it (state 0)
-
+# 
 
 ###############################
 # a few git shortcuts
@@ -34,7 +37,7 @@ ci:
       || (git commit  -F log && touch committed)
 
 push:
-	make opam-test && git push
+	git push && make uv
 
 merge: merge_work_into_master
 merge_work_into_master:
diff --git a/_oasis b/_oasis
index eaed2902c2b009d7234fafbb10df0576eb393778..eaabdb2623eb8c6184bc5aa65935666fc9676b4d 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        lutils
-Version:     1.20
+Version:     1.22
 Authors:     Erwan Jahier
 Maintainers: erwan.jahier@imag.fr
 License:     GPL-3
diff --git a/doc/version.tex b/doc/version.tex
index 633133a8f49d178bc58b9d8922af77cb6313fbd5..e0a559e9d26e99aae3766c14ea1dd80d45c23947 100644
--- a/doc/version.tex
+++ b/doc/version.tex
@@ -1,4 +1,4 @@
-\newcommand{\version}{1.21}
-\newcommand{\sha}{fb28a81}
+\newcommand{\version}{1.22}
+\newcommand{\sha}{67792db}
 \newcommand{\versionname}{none}
 \newcommand{\versiondate}{08-12-17}
diff --git a/setup.ml b/setup.ml
index 7925d3f638fd19baed127ac0ff5ec375a3ad716e..0a45e20129cf453b4b082063540e2279d3043473 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: 9b558962553bf4cacdb94a84135503ac) *)
+(* DO NOT EDIT (digest: c3931a0407d5bf5bbfe984ac8903f4a6) *)
 (*
    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.20";
+          version = "1.22";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7254,7 +7254,8 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.10";
-     oasis_digest = Some "#E\159\194\248\006\017\182Xh\171\252\166\180f\169";
+     oasis_digest =
+       Some "\240\246\152\175\150\242I\017?k4\160\171\163\219\133";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7262,7 +7263,7 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7266 "setup.ml"
+# 7267 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)
diff --git a/src/META b/src/META
index b1ee7a20fa97dcdfabbdefaba6e21f9d79af6627..6afd54dc008cd10fff7dfa3f581da7e42c29200e 100644
--- a/src/META
+++ b/src/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: fc29f7232b22802fd3f42875b87b5ac7)
-version = "1.20"
+# DO NOT EDIT (digest: 8e03da8e91e95d09b4227d20939ab65a)
+version = "1.22"
 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 fa3d89235ae3055b3857ebd15c02596b1ee31910..384205780806ecba31c124ffceaa62f35e1e9478 100644
--- a/src/lutilsVersion.ml
+++ b/src/lutilsVersion.ml
@@ -1,2 +1,2 @@
-let str="1.21"
-let sha="fb28a81"
+let str="1.22"
+let sha="67792db"