Skip to content

ci: add pre-merge check to detect duplicate recipe versions #15780

Description

@rpcme

Context

Issue #15715 identified that master accumulates orphaned recipe files when master-next → master merges occur. Git treats recipe version bumps (file renames) as delete + add, so merging two branches that independently upgraded the same recipe results in both versions being kept silently.

Proposal

Add a CI check (pre-merge hook or workflow) that runs on release merge PRs (master-next → master) to detect when multiple .bb files exist for the same recipe name (e.g., python3-botocore_1.42.93.bb AND python3-botocore_1.43.6.bb).

The check should:

  1. Scan for duplicate recipe names with different versions in the merge result
  2. Fail the merge if duplicates are found
  3. Suggest which files to delete (keep only the highest version)

Priority

Post-release. The immediate cleanup of stale files on master can be done as a one-time commit (see #15715).

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions