diff .gitlab-ci.yml @ 5541:98e2613d797d

branching: merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 17 Sep 2020 20:26:55 +0200
parents 02804d8bac31 2f572645b6d5
children 0e23393dda9c
line wrap: on
line diff
--- a/.gitlab-ci.yml	Tue Jul 21 01:02:46 2020 +0800
+++ b/.gitlab-ci.yml	Thu Sep 17 20:26:55 2020 +0200
@@ -1,7 +1,9 @@
 .prepare_hg: &prepare_hg
     - hg pull -R /ci/repos/mercurial/
-    - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg identify --branch)")
-    - hg -R /ci/repos/mercurial/ update "$hg_rev"
+    - hg_branch=$(tests/testlib/map-hg-rev.sh "$(hg identify --branch)")
+    - hg -R /ci/repos/mercurial/ update "$hg_branch"
+    - hg_rev=$(hg log -R /ci/repos/mercurial/       -r . -T '{node}')
+    - echo testing with mercurial branch="$hg_branch", revision="$hg_rev"
 
 pytype:
     image: octobus/ci-py3-hgext3rd