Skip to content

Commit 9a6478f

Browse files
committed
compare fails: more robust grep
1 parent b4d4153 commit 9a6478f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

.github/workflows/compare_fails.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,13 @@ jobs:
7575
VERSION=$(git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\.[0-9]\+\).*/\1/')
7676
echo "Detected version: $VERSION"
7777
78-
CURRENT_TAG=$(git tag --contains ${{ github.sha }} | grep 'altinity')
78+
CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity')
79+
echo "CURRENT_TAG: $CURRENT_TAG ${{ inputs.current_ref || github.sha }}"
7980
PREVIOUS_TAG_COMMIT=$(git log -1 --until=yesterday --tags=v${VERSION}*.altinity* | grep -Po "(?<=commit ).*")
80-
PREVIOUS_TAG=$(git tag --contains $PREVIOUS_TAG_COMMIT | grep 'altinity')
81+
PREVIOUS_TAG=$(git tag --contains $PREVIOUS_TAG_COMMIT | sort -r | grep -m 1 'altinity')
8182
echo "PREVIOUS_TAG: $PREVIOUS_TAG $PREVIOUS_TAG_COMMIT"
8283
UPSTREAM_TAG_COMMIT=$(git log -1 --tags=v${VERSION}*-lts | grep -Po "(?<=commit ).*")
83-
UPSTREAM_TAG=$(git tag --contains $UPSTREAM_TAG_COMMIT | grep 'lts')
84+
UPSTREAM_TAG=$(git tag --contains $UPSTREAM_TAG_COMMIT | sort -r | grep -m 1 'lts')
8485
echo "UPSTREAM_TAG: $UPSTREAM_TAG $UPSTREAM_TAG_COMMIT"
8586
8687
echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)