Skip to content

[devtools] Handle automatic rebase of config files (#1444)#2398

Merged
brondani merged 1 commit intoOpen-CMSIS-Pack:mainfrom
ARM-software:outbound/devtools-handle-config-rebase
Mar 16, 2026
Merged

[devtools] Handle automatic rebase of config files (#1444)#2398
brondani merged 1 commit intoOpen-CMSIS-Pack:mainfrom
ARM-software:outbound/devtools-handle-config-rebase

Conversation

@grasci-arm
Copy link
Collaborator

@grasci-arm grasci-arm commented Mar 16, 2026

Address #2194

  • Remove ProjMgrUtils::NormalizeLineEndings and related test cases, use RteUtils::EnsureLf instead
  • Add RteFsUtils::CmpFiles and related test cases
  • Add config rebase mechanism in RteProject::UpdateConfigFileBackups and update related test case RteModelPrjTest.LoadCprjConfigVer
  • Add projmgr test case ProjMgrUnitTests.ConfigFilesUpdateRebase

)

* [devtools] Handle automatic rebase of config files

* Address review comments
@github-actions
Copy link

github-actions bot commented Mar 16, 2026

Test Results

  7 files   53 suites   4m 53s ⏱️
185 tests 168 ✅ 17 💤 0 ❌
692 runs  624 ✅ 68 💤 0 ❌

Results for commit 6402853.

♻️ This comment has been updated with latest results.

@brondani brondani merged commit 447b1e5 into Open-CMSIS-Pack:main Mar 16, 2026
101 checks passed
@brondani brondani deleted the outbound/devtools-handle-config-rebase branch March 16, 2026 10:56
@codecov
Copy link

codecov bot commented Mar 16, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 64.66%. Comparing base (c779cb3) to head (6402853).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2398      +/-   ##
==========================================
- Coverage   64.67%   64.66%   -0.02%     
==========================================
  Files         145      145              
  Lines       26097    26088       -9     
  Branches    15747    15743       -4     
==========================================
- Hits        16878    16869       -9     
+ Misses       7068     7047      -21     
- Partials     2151     2172      +21     
Flag Coverage Δ
buildmgr-cov 79.87% <ø> (ø)
packchk-cov 69.73% <ø> (ø)
packgen-cov 82.02% <ø> (ø)
projmgr-cov 87.70% <100.00%> (-0.02%) ⬇️

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

Files with missing lines Coverage Δ
tools/projmgr/include/ProjMgrUtils.h 87.50% <ø> (ø)
tools/projmgr/src/ProjMgrUtils.cpp 93.79% <ø> (-0.19%) ⬇️
tools/projmgr/src/ProjMgrYamlEmitter.cpp 94.59% <100.00%> (ø)

... and 7 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

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.

2 participants