Skip to content

[FIX] Check if the triggering commit is a merge commit#4644

Merged
joragua merged 1 commit intomasterfrom
fix/prevent_sbom_from_merge_commits
Jul 17, 2025
Merged

[FIX] Check if the triggering commit is a merge commit#4644
joragua merged 1 commit intomasterfrom
fix/prevent_sbom_from_merge_commits

Conversation

@jesmrec
Copy link
Collaborator

@jesmrec jesmrec commented Jul 17, 2025

If the commit that pushes is a merge commit, skip the sbom job.

Related Issues

App:

  • Add changelog files for the fixed issues in folder changelog/unreleased. More info here
  • Add feature to Release Notes in ReleaseNotesViewModel.kt creating a new ReleaseNote() with String resources (if required)

QA

@jesmrec jesmrec requested a review from joragua July 17, 2025 06:38
@jesmrec jesmrec force-pushed the fix/prevent_sbom_from_merge_commits branch from f2ec586 to 05ae211 Compare July 17, 2025 07:19
@jesmrec jesmrec force-pushed the fix/prevent_sbom_from_merge_commits branch from 05ae211 to a7d9342 Compare July 17, 2025 07:22
Copy link
Collaborator

@joragua joragua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Let's see if it's the final SBOM PR 🤞🏻

@joragua joragua merged commit 19e5d86 into master Jul 17, 2025
10 checks passed
@joragua joragua deleted the fix/prevent_sbom_from_merge_commits branch July 17, 2025 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants