fix: simplify the condition of merge commit

Author: jesmrec

.github/workflows/sbom.yml

@@ -15,27 +15,9 @@ permissions:
   contents: write
 
 jobs:
-  check_merge:
-    runs-on: ubuntu-latest
-    outputs:
-      is_merge: ${{ steps.check_merge_commit.outputs.is_merge }}
-    steps:
-      # Check if commit is a merge commit by message
-      - name: Is merge
-        id: check_merge_commit
-        run: |
-          echo "Commit message: ${{ github.event.head_commit.message }}"
-          if echo "${{ github.event.head_commit.message }}" | grep "Merge pull request"; then
-            echo "is_merge=true" >> $GITHUB_OUTPUT
-          else
-            echo "is_merge=false" >> $GITHUB_OUTPUT
-          fi
-
   sbom:
-    # To execute when "check_merge" finishes
-    needs: check_merge
-    # Skip if the job was triggered by the SBOM commit in the latest push.
-    if: "needs.check_merge.outputs.is_merge != 'true' && !contains(github.event.head_commit.message, 'SBOM updated')"
+    # Skip if the job was triggered by the SBOM commit or a merge commit in the latest push.
+    if: "!contains(github.event.head_commit.message, 'Merge pull request') && !contains(github.event.head_commit.message, 'SBOM updated')"
     runs-on: ubuntu-latest
 
     steps: