From 21129c90a8c96a9a85cbbd4e292e72385c580876 Mon Sep 17 00:00:00 2001 From: Stephan Date: Fri, 4 Jun 2021 13:13:07 +0200 Subject: [PATCH] wip --- .github/workflows/exp.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/exp.yml b/.github/workflows/exp.yml index 77be6c9..13dcaff 100644 --- a/.github/workflows/exp.yml +++ b/.github/workflows/exp.yml @@ -67,13 +67,13 @@ jobs: echo "::error::Branch release/$HZVERSION does not exist" exit 1 else - git tag --contains release/$HZVERSION - git log --graph --pretty=format':%h%%d %s %an, %ar' | head -n 5 - if (git tag --contains release/$HZVERSION | grep -q $HZTAG); then - echo "Tag is in the correct branch" + HZBRANCHSHA=$(git rev-parse release/$HZVERSION) + HZPARENTSHA=$(git rev-parse $HZTAG^1) + if [ "$HZBRANCHSHA" != "$HZPARENTSHA" ]; then + echo "::error::Tag parent is not HEAD of release/$HZVERSION but $HZPARENTSHA" + exit 1 else - echo "::error::Tag $HZTAG does not belong to branch release/$HZVERSION" - exit 1 + echo "Tag parent is HEAD of release/$HZVERSION, proceed" fi fi else