compare fails: favour tag over commit when possible

Author: strtgbb

.github/workflows/compare_fails.yml

@@ -75,24 +75,29 @@ jobs:
           VERSION=$(git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\.[0-9]\+\).*/\1/')
           echo "Detected version: $VERSION"
 
+          CURRENT_TAG=$(git tag --contains ${{ github.sha }} | grep 'altinity')
           PREVIOUS_TAG_COMMIT=$(git log -1 --until=yesterday --tags=v${VERSION}*.altinity* | grep -Po "(?<=commit ).*")
-          echo "PREVIOUS_TAG: $(git tag --contains $PREVIOUS_TAG_COMMIT | grep 'altinity') $PREVIOUS_TAG_COMMIT"
+          PREVIOUS_TAG=$(git tag --contains $PREVIOUS_TAG_COMMIT | grep 'altinity')
+          echo "PREVIOUS_TAG: $PREVIOUS_TAG $PREVIOUS_TAG_COMMIT"
           UPSTREAM_TAG_COMMIT=$(git log -1 --tags=v${VERSION}*-lts | grep -Po "(?<=commit ).*")
-          echo "UPSTREAM_TAG: $(git tag --contains $UPSTREAM_TAG_COMMIT | grep 'lts') $UPSTREAM_TAG_COMMIT"
+          UPSTREAM_TAG=$(git tag --contains $UPSTREAM_TAG_COMMIT | grep 'lts')
+          echo "UPSTREAM_TAG: $UPSTREAM_TAG $UPSTREAM_TAG_COMMIT"
 
+          echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_OUTPUT
           echo "PREVIOUS_TAG_COMMIT=$PREVIOUS_TAG_COMMIT" >> $GITHUB_OUTPUT
+          echo "UPSTREAM_TAG=$UPSTREAM_TAG" >> $GITHUB_OUTPUT
           echo "UPSTREAM_TAG_COMMIT=$UPSTREAM_TAG_COMMIT" >> $GITHUB_OUTPUT
-
+          echo "CURRENT_TAG=$CURRENT_TAG" >> $GITHUB_OUTPUT
       - name: Comparison report
         if: ${{ !cancelled() }}
         run: |
           git clone https://github.com/Altinity/actions.git
           cd actions
           git checkout 4623f919ee2738bea69aad405879562476736932
           python3 scripts/compare_ci_fails.py \
-            --current-ref ${{ inputs.current_ref || github.sha }} \
-            --previous-ref ${{ inputs.previous_ref || steps.default_refs.outputs.PREVIOUS_TAG_COMMIT }} \
-            --upstream-ref ${{ inputs.upstream_ref || steps.default_refs.outputs.UPSTREAM_TAG_COMMIT }} \
+            --current-ref ${{ steps.default_refs.outputs.CURRENT_TAG || inputs.current_ref || github.sha }} \
+            --previous-ref ${{ steps.default_refs.outputs.PREVIOUS_TAG || inputs.previous_ref || steps.default_refs.outputs.PREVIOUS_TAG_COMMIT }} \
+            --upstream-ref ${{ steps.default_refs.outputs.UPSTREAM_TAG || inputs.upstream_ref || steps.default_refs.outputs.UPSTREAM_TAG_COMMIT }} \
             ${{ inputs.include_broken && '--broken' || '' }}
           cat comparison_results.md >> $GITHUB_STEP_SUMMARY