Skip to content

Patina 22.1.0 integration (r-efi 7) [Rebase & FF]#908

Merged
makubacki merged 2 commits into
microsoft:release/202511from
makubacki:r_efi_7_integration_2511
Jun 25, 2026
Merged

Patina 22.1.0 integration (r-efi 7) [Rebase & FF]#908
makubacki merged 2 commits into
microsoft:release/202511from
makubacki:r_efi_7_integration_2511

Conversation

@makubacki

@makubacki makubacki commented Jun 24, 2026

Copy link
Copy Markdown
Member

Description

Two commits to integrate the latest patina v22.1.0 (and fix the build).


Cargo.toml: Add AdvLoggerPkg/Crates/RustAdvancedLoggerDxe as a member

Library crates are currently being listed in the members section, so
the line about binary crates is removed.

RustAdvancedLoggerDxe is currently being built as a dependency, but
this commit adds it as a member for consistency with other crates.


Bump r-efi to 7 to match patina's update

patina 22.1.0 moved its r-efi dependency up to version 7, but the
workspace was still pinned to ^6.

Cargo then pulled in both r-efi 6 and 7 at the same time, and since
types from different major versions don't unify, that broke
cargo make check and cargo make test.

This moves the workspace to r-efi 7.


  • Impacts functionality?
  • Impacts security?
  • Breaking change?
  • Includes tests?
  • Includes documentation?

How This Was Tested

  • cargo make tasks
  • Repo CI

Integration Instructions

  • If library crates are used from this repo, it is recommended to move to r-efi 7.

Library crates are currently being listed in the `members` section, so
the line about binary crates is removed.

RustAdvancedLoggerDxe is currently being built as a dependency, but
this commit adds it as a member for consistency with other crates.

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
patina 22.1.0 moved its r-efi dependency up to version 7, but the
workspace was still pinned to ^6.

Cargo then pulled in both r-efi 6 and 7 at the same time, and since
types from different major versions don't unify, that broke
`cargo make check` and `cargo make test`.

This moves the workspace to r-efi 7.

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
@makubacki makubacki requested review from Javagedes, cfernald and os-d June 24, 2026 23:22
@makubacki makubacki self-assigned this Jun 24, 2026
@mu-automation

mu-automation Bot commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

✅ QEMU Validation Passed

Source Dependencies

Repository Commit
mu_plus 356dfca
mu_tiano_platforms 81aa047

Results

Platform Target Build Boot Overall Boot Time Build Logs Boot Logs
Q35 DEBUG ✅ success ✅ success 0m 20s Build Logs Boot Logs
ArmVirt DEBUG ✅ success ✅ success 0m 14s Build Logs Boot Logs

Workflow run: https://github.com/microsoft/mu_plus/actions/runs/28136453247

This comment was automatically generated by the Mu QEMU PR Validation workflow.

@codecov-commenter

codecov-commenter commented Jun 24, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (release/202511@bfc78cc). Learn more about missing BASE report.

Additional details and impacted files
@@                Coverage Diff                @@
##             release/202511     #908   +/-   ##
=================================================
  Coverage                  ?   10.21%           
=================================================
  Files                     ?      150           
  Lines                     ?    24568           
  Branches                  ?     2346           
=================================================
  Hits                      ?     2509           
  Misses                    ?    22023           
  Partials                  ?       36           
Flag Coverage Δ
AdvLoggerPkg 3.03% <ø> (?)
HidPkg 2.79% <ø> (?)
MfciPkg 34.00% <ø> (?)
MsCorePkg 1.30% <ø> (?)
MsWheaPkg 7.37% <ø> (?)
XmlSupportPkg 25.46% <ø> (?)

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

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

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

@mu-automation mu-automation Bot added the impact:breaking-change Requires integration attention label Jun 25, 2026
@makubacki

Copy link
Copy Markdown
Member Author

To be conservative, I marked this as a breaking change to bring awareness to the r-efi version update.

@makubacki makubacki merged commit 32f552c into microsoft:release/202511 Jun 25, 2026
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

impact:breaking-change Requires integration attention

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants