Skip to content

chore: merge unstable into epbs (CI check only, do not squash) - #1333

Merged
shane-moore merged 4 commits into
sigp:epbsfrom
shane-moore:merge-unstable-into-epbs-v1.3.2
Oct 1, 2026
Merged

shane-moore merged 4 commits into
sigp:epbsfrom
shane-moore:merge-unstable-into-epbs-v1.3.2

Conversation

@shane-moore

Copy link
Copy Markdown
Member

DO NOT MERGE. DO NOT SQUASH. This PR exists only to run CI. The merge commit will be pushed directly to epbs so it keeps both parents; a squash would duplicate unstable's commits on epbs and re-conflict when epbs merges back.

Merges upstream/unstable (d0c4c7ea) into epbs (6b97ae37). Brings across the v1.3.2 release via its backmerge (#1332): chore: bump deps (#1330) and chore: Release v1.3.2 (#1331).

Conflicts: none. Files changed on both sides since the merge base were Cargo.lock and anchor/client/Cargo.toml; against epbs, each shows only unstable's side (the version bump and lockfile entries), and epbs's own changes are intact.

Checked locally on the merge commit:

  • 2-parent merge: epbs 6b97ae37 + unstable d0c4c7ea
  • cargo metadata --locked: lockfile consistent with the manifests
  • cargo check --workspace --all-targets: clean
  • make cargo-fmt: no changes
  • make lint: clean

🤖 Generated with Claude Code

@shane-moore
shane-moore merged commit 6817d74 into sigp:epbs Oct 1, 2026
20 of 21 checks passed
@shane-moore
shane-moore deleted the merge-unstable-into-epbs-v1.3.2 branch October 1, 2026 23:12
@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (epbs@6b97ae3). Learn more about missing BASE report.

Additional details and impacted files
@@           Coverage Diff           @@
##             epbs    #1333   +/-   ##
=======================================
  Coverage        ?   80.88%           
=======================================
  Files           ?      179           
  Lines           ?    41247           
  Branches        ?        0           
=======================================
  Hits            ?    33364           
  Misses          ?     7883           
  Partials        ?        0           
Flag Coverage Δ
rust 80.88% <ø> (?)

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.

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