Skip to content

v2.2: chore: use local solana-zk-sdk (backport of #6767)#6770

Merged
yihau merged 2 commits intov2.2from
mergify/bp/v2.2/pr-6767
Jul 1, 2025
Merged

v2.2: chore: use local solana-zk-sdk (backport of #6767)#6770
yihau merged 2 commits intov2.2from
mergify/bp/v2.2/pr-6767

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Jun 30, 2025

Problem

not sure if we should use the local solana-zk-sdk

Summary of Changes

update the path and version


This is an automatic backport of pull request #6767 done by Mergify.

use local solana-zk-sdk

(cherry picked from commit 528d984)

# Conflicts:
#	programs/sbf/Cargo.toml
@mergify mergify Bot added the conflicts label Jun 30, 2025
@mergify mergify Bot requested a review from a team as a code owner June 30, 2025 02:38
@mergify mergify Bot assigned yihau Jun 30, 2025
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Jun 30, 2025

Cherry-pick of 528d984 has failed:

On branch mergify/bp/v2.2/pr-6767
Your branch is up to date with 'origin/v2.2'.

You are currently cherry-picking commit 528d98467.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@yihau yihau removed the conflicts label Jun 30, 2025
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Jun 30, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.3%. Comparing base (8579639) to head (cd0d272).
⚠️ Report is 10 commits behind head on v2.2.

Additional details and impacted files
@@            Coverage Diff            @@
##             v2.2    #6770     +/-   ##
=========================================
- Coverage    83.4%    83.3%   -0.1%     
=========================================
  Files         807      807             
  Lines      373484   373484             
=========================================
- Hits       311629   311468    -161     
- Misses      61855    62016    +161     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@yihau yihau merged commit 74a35e1 into v2.2 Jul 1, 2025
25 checks passed
@yihau yihau deleted the mergify/bp/v2.2/pr-6767 branch July 1, 2025 02:51
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.

4 participants