Skip to content

v3.0: Revert "svm repo split: fork metrics (#7442)" (backport of #7806)#7824

Merged
steviez merged 2 commits intov3.0from
mergify/bp/v3.0/pr-7806
Sep 4, 2025
Merged

v3.0: Revert "svm repo split: fork metrics (#7442)" (backport of #7806)#7824
steviez merged 2 commits intov3.0from
mergify/bp/v3.0/pr-7806

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Sep 2, 2025

This reverts commit c278df4.


This is an automatic backport of pull request #7806 done by [Mergify](https://mergify.com).

@mergify mergify Bot requested a review from a team as a code owner September 2, 2025 15:13
@mergify mergify Bot added the conflicts label Sep 2, 2025
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Sep 2, 2025

Cherry-pick of d7fdc8b has failed:

On branch mergify/bp/v3.0/pr-7806
Your branch is up to date with 'origin/v3.0'.

You are currently cherry-picking commit d7fdc8bf6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   program-runtime/Cargo.toml
	modified:   program-runtime/src/lib.rs
	deleted:    svm-metrics/Cargo.toml
	deleted:    svm-metrics/benches/metrics.rs
	deleted:    svm-metrics/src/counter.rs
	deleted:    svm-metrics/src/datapoint.rs
	deleted:    svm-metrics/src/lib.rs
	deleted:    svm-metrics/src/metrics.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   programs/sbf/Cargo.lock

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify Bot assigned steviez Sep 2, 2025
buffalojoec and others added 2 commits September 3, 2025 10:59
This reverts commit c278df4.

(cherry picked from commit d7fdc8b)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	programs/sbf/Cargo.lock
@steviez steviez force-pushed the mergify/bp/v3.0/pr-7806 branch from ed20dbb to 2bb38bf Compare September 3, 2025 15:59
@steviez
Copy link
Copy Markdown

steviez commented Sep 3, 2025

Force pushed to pickup the unrelated CI fix from #7846

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.4%. Comparing base (ddca2f9) to head (2bb38bf).

Additional details and impacted files
@@           Coverage Diff            @@
##             v3.0    #7824    +/-   ##
========================================
  Coverage    83.4%    83.4%            
========================================
  Files         814      810     -4     
  Lines      366089   365309   -780     
========================================
- Hits       305517   304983   -534     
+ Misses      60572    60326   -246     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@t-nelson
Copy link
Copy Markdown

t-nelson commented Sep 4, 2025

need sme approval here

@steviez
Copy link
Copy Markdown

steviez commented Sep 4, 2025

need sme approval here

I was hesitant to give the second review myself, but I think the combo of Joe & myself suffices so going to merge

@steviez steviez merged commit 754b6de into v3.0 Sep 4, 2025
42 checks passed
@steviez steviez deleted the mergify/bp/v3.0/pr-7806 branch September 4, 2025 16:27
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.

4 participants