Commit f38cf384 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Merge from oldstable branch

--HG--
branch : heptapod-stable
......@@ -8,14 +8,16 @@ if echo "$CI_COMMIT_TAG" | grep '^heptapod-' > /dev/null; then
# so that `hg archive` should see the tag (very unlikely the tagging
# changeset would be elsewhere, not worth pulling the whole repo)
# using `hg log` instead of `hg branch` to avoid newline for safety
hg pull -q -r heptapod -r heptapod-stable -r `hg log -r. -T "{branch}"` || /bin/true
hg pull -q -r heptapod -r heptapod-stable -r heptapod-oldstable -r `hg log -r. -T "{branch}"` || /bin/true
SUBDIR=public
# why two greps and not a single `else` case? To avoid painful
# why three greps and not a single `else` case? To avoid painful
# release commit and tag creation in the wrong branch of omninus-heptapod
# if, e.g., we change the name of the CI image and forget to update this
# script.
if grep ci-images/heptapod-base:stable heptapod-ci.yml >/dev/null; then
if grep ci-images/heptapod-base:oldstable heptapod-ci.yml >/dev/null; then
TRIGGER_OMNIBUS_BRANCH=heptapod-oldstable
elif grep ci-images/heptapod-base:stable heptapod-ci.yml >/dev/null; then
TRIGGER_OMNIBUS_BRANCH=heptapod-stable
elif grep ci-images/heptapod-base:default heptapod-ci.yml >/dev/null; then
TRIGGER_OMNIBUS_BRANCH=heptapod
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment