Merge pull request #869 from Altinity/strtgbb-patch-3

Antalya small CI fixes

Author: MyroTk

.github/workflows/compare_fails.yml

@@ -75,24 +75,30 @@ jobs:
           VERSION=$(git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\.[0-9]\+\).*/\1/')
           echo "Detected version: $VERSION"
 
+          CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity')
+          echo "CURRENT_TAG: $CURRENT_TAG ${{ inputs.current_ref || github.sha }}"
           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 | sort -r | grep -m 1 '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 | sort -r | grep -m 1 '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 c5751cefd4f56bd7300b5f6d84a5ae9d0b686772
+          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
 

.github/workflows/grype_scan.yml

@@ -61,7 +61,7 @@ jobs:
             TAG_SUFFIX: ${{ inputs.tag-suffix }}
             SPECIFIED_VERSION: ${{ inputs.version }}
           run: |
-            python3 ./tests/ci/version_helper.py | tee /tmp/version_info
+            python3 ./tests/ci/version_helper.py | grep = | tee /tmp/version_info
             source /tmp/version_info
             if [ -z "$SPECIFIED_VERSION" ]; then
                 VERSION=$CLICKHOUSE_VERSION_STRING