Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.17: Enable frozen_abi on banking trace file (backport of #33501) #33578

Merged
merged 2 commits into from
Oct 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 7, 2023

This is an automatic backport of pull request #33501 done by Mergify.
Cherry-pick of 95810d8 has failed:

On branch mergify/bp/v1.17/pr-33501
Your branch is up to date with 'origin/v1.17'.

You are currently cherry-picking commit 95810d876a.
  (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:   core/src/banking_trace.rs
	modified:   core/src/sigverify.rs
	modified:   frozen-abi/Cargo.toml
	modified:   frozen-abi/src/abi_digester.rs
	modified:   frozen-abi/src/abi_example.rs
	modified:   perf/Cargo.toml
	modified:   perf/build.rs
	modified:   perf/src/cuda_runtime.rs
	modified:   perf/src/lib.rs
	modified:   perf/src/packet.rs
	modified:   perf/src/recycler.rs
	modified:   programs/sbf/Cargo.lock
	modified:   sdk/src/packet.rs

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

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Oct 7, 2023
@mergify mergify bot assigned ryoqun Oct 7, 2023
@ryoqun ryoqun changed the title v1.17: Enable frozen_abi on banking trace file (backport of #33501) [WIP] v1.17: Enable frozen_abi on banking trace file (backport of #33501) Oct 7, 2023
@codecov
Copy link

codecov bot commented Oct 7, 2023

Codecov Report

Merging #33578 (1df90c8) into v1.17 (02f9c97) will increase coverage by 0.0%.
The diff coverage is 98.2%.

@@           Coverage Diff           @@
##            v1.17   #33578   +/-   ##
=======================================
  Coverage    81.7%    81.7%           
=======================================
  Files         804      804           
  Lines      218124   218158   +34     
=======================================
+ Hits       178412   178441   +29     
- Misses      39712    39717    +5     

@ryoqun ryoqun closed this Oct 16, 2023
@mergify mergify bot deleted the mergify/bp/v1.17/pr-33501 branch October 16, 2023 02:16
@ryoqun ryoqun restored the mergify/bp/v1.17/pr-33501 branch October 16, 2023 02:17
@ryoqun
Copy link
Contributor

ryoqun commented Oct 16, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

rebase

☑️ Nothing to do

  • -closed [:pushpin: rebase requirement]

@ryoqun ryoqun reopened this Oct 16, 2023
@ryoqun
Copy link
Contributor

ryoqun commented Oct 16, 2023

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

rebase

❌ Unable to rebase: user ryoqun is unknown.

Please make sure ryoqun has logged in Mergify dashboard.

@ryoqun
Copy link
Contributor

ryoqun commented Oct 16, 2023

@Mergifyio rebase

* Enable frozen_abi on banking trace file

* Fix ci with really correct bugfix...

* Remove tracker_callers

* Fix typo...

* Fix AbiExample for Arc/Rc's Weaks

* Added comment for AbiExample impl of SystemTime

* Simplify and document EvenAsOpaque with new usage

* Minor clean-ups

* Simplify SystemTime::example() with UNIX_EPOCH...

* Add comment for AbiExample subtleties

(cherry picked from commit 95810d8)

# Conflicts:
#	Cargo.lock
@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

rebase

✅ Branch has been successfully rebased

@ryoqun ryoqun force-pushed the mergify/bp/v1.17/pr-33501 branch from 7284b32 to 1df90c8 Compare October 16, 2023 02:22
@ryoqun ryoqun requested a review from apfitzge October 16, 2023 04:19
@ryoqun ryoqun changed the title [WIP] v1.17: Enable frozen_abi on banking trace file (backport of #33501) v1.17: Enable frozen_abi on banking trace file (backport of #33501) Oct 17, 2023
@ryoqun ryoqun merged commit 8af8234 into v1.17 Oct 17, 2023
16 checks passed
@ryoqun ryoqun deleted the mergify/bp/v1.17/pr-33501 branch October 17, 2023 04:48
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