Skip to content

[projmgr] Validate component Cbundle conflicts (ignore Cvendor)#2401

Merged
brondani merged 9 commits intoOpen-CMSIS-Pack:mainfrom
jthuangarm:main
Mar 18, 2026
Merged

[projmgr] Validate component Cbundle conflicts (ignore Cvendor)#2401
brondani merged 9 commits intoOpen-CMSIS-Pack:mainfrom
jthuangarm:main

Conversation

@jthuangarm
Copy link
Contributor

@jthuangarm jthuangarm commented Mar 16, 2026

  • Fix and improve the DuplicateComponents unit test, as it is important to clear error message afterwards for different use cases.
  • Fix: [csolution] Missing Error Message (+ Improved Error message) #1197 . If Cbundle exists, the same Cclass must belong to the same Cbundle, while ignoring Cvendor. Expected error message from TestProject2 is as follows:
error csolution: components in the same Cclass must belong to the same Cbundle.
Conflicting Cbundle in Cclass 'RteTestBundle':
  - 'BundleOne' component(s):
    - ARM::RteTestBundle&BundleOne:G0
    - ARM::RteTestBundle&BundleOne:G1
  - 'BundleTwo' component(s):
    - SomeVendor::RteTestBundle&BundleTwo:G0
Conflicting Cbundle in Cclass 'RteTestBundle2':
  - 'BundleOne' component(s):
    - SomeVendor::RteTestBundle2&BundleOne:G0
  - 'BundleTwo' component(s):
    - SomeVendor::RteTestBundle2&BundleTwo:G0

@jthuangarm jthuangarm marked this pull request as ready for review March 17, 2026 10:50
@jthuangarm jthuangarm requested a review from brondani March 17, 2026 10:54
@jthuangarm jthuangarm requested a review from brondani March 18, 2026 14:15
Copy link
Collaborator

@brondani brondani left a comment

Choose a reason for hiding this comment

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

LGTM.
Please update the PR description.

@jthuangarm
Copy link
Contributor Author

@brondani The PR description has been updated. Please merge this PR, as even with write permission, I do not have the right to merge it.

@brondani brondani merged commit 18b0ef8 into Open-CMSIS-Pack:main Mar 18, 2026
41 checks passed
@codecov
Copy link

codecov bot commented Mar 18, 2026

Codecov Report

❌ Patch coverage is 95.45455% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 64.69%. Comparing base (f8e931e) to head (166942c).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
tools/projmgr/src/ProjMgrWorker.cpp 95.45% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2401      +/-   ##
==========================================
+ Coverage   64.66%   64.69%   +0.02%     
==========================================
  Files         145      145              
  Lines       26092    26113      +21     
  Branches    15745    15761      +16     
==========================================
+ Hits        16872    16893      +21     
  Misses       7068     7068              
  Partials     2152     2152              
Flag Coverage Δ
projmgr-cov 87.72% <95.45%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
tools/projmgr/src/ProjMgrWorker.cpp 88.08% <95.45%> (+0.06%) ⬆️
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

jthuangarm added a commit to Open-CMSIS-Pack/cmsis-toolbox that referenced this pull request Mar 18, 2026
Clarify rules of multiple component declaration for components
- Related to Open-CMSIS-Pack/devtools#2401

## Checklist
<!-- Put an `x` in the boxes. All tasks must be completed and boxes
checked before merging. -->
- [x] 🤖 This change is covered by unit tests (if applicable).
- [x] 🤹 Manual testing has been performed (if necessary).
- [x] 🛡️ Security impacts have been considered (if relevant).
- [x] 📖 Documentation updates are complete (if required).
- [x] 🧠 Third-party dependencies and TPIP updated (if required).

---------

Co-authored-by: Joachim Krech <8290187+jkrech@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[csolution] Missing Error Message (+ Improved Error message)

2 participants