address the missing upstream VERSION case

Address the case where the upstream VERSION file is missing, but present downstream. Signed-off-by: Pranshu Srivastava <[email protected]>
rhobs · Nov 12, 2024 · b83a1bf · b83a1bf
1 parent 6176eba
commit b83a1bf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/merge-flow.yaml b/.github/workflows/merge-flow.yaml
@@ -135,7 +135,8 @@ jobs:
           git config user.name 'github-actions[bot]'
           git config user.email 'github-actions[bot]@users.noreply.github.com'
           git config --global core.editor "/bin/true"
-          git fetch https://github.com/${{ inputs.upstream }} --tags
+          git remote add upstream https://github.com/${{ inputs.upstream }}
+          git fetch upstream --tags
       - name: Merge with upstream ${{ steps.upstream.outputs.release }} tag
         id: merge
         run: |
@@ -161,9 +162,12 @@ jobs:
         run: git merge --continue
       - name: Add VERSION file if not present
         run: |
+          set -x
+          is_version_file_present_upstream=$(git ls-tree ${{ steps.upstream.outputs.release }} | grep VERSION)
           # All tags use the vX.Y.Z format currently.
           version_from_tag=$(echo ${{ steps.upstream.outputs.release }} | sed -e "s/^v//")
-          if [ -f VERSION ]; then
+          # Perform check only if both remotes have the VERSION file.
+          if [ -n "$is_version_file_present_upstream" ] && [ -f VERSION ]; then
             version_from_file=$(cat VERSION)
             if [ "$version_from_tag" != "$version_from_file" ];then
               echo "::error:: tag version ${version_from_tag} doesn't correspond to version ${version_from_file} from VERSION file"