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.16: Transient accounts hash cache dir is unnecessary (backport of #33181) #33221

Merged
merged 1 commit into from
Sep 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 12, 2023

This is an automatic backport of pull request #33181 done by Mergify.
Cherry-pick of c61ee20 has failed:

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

You are currently cherry-picking commit c61ee20b44.
  (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:   runtime/src/accounts_db.rs

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/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

@brooksprumo
Copy link
Contributor

This PR needs #33212 to be merged first, then this one can be rebased again.

@brooksprumo
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: could not apply 75a158685... Transient accounts hash cache dir is unnecessary (#33181)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 75a158685... Transient accounts hash cache dir is unnecessary (#33181)

@brooksprumo
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
Auto-merging runtime/src/accounts_db.rs
CONFLICT (content): Merge conflict in runtime/src/accounts_db.rs
error: could not apply 75a158685... Transient accounts hash cache dir is unnecessary (#33181)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 75a158685... Transient accounts hash cache dir is unnecessary (#33181)

@brooksprumo
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Sep 13, 2023

refresh

✅ Pull request refreshed

@brooksprumo brooksprumo force-pushed the mergify/bp/v1.16/pr-33181 branch from 75a1586 to 144e597 Compare September 13, 2023 15:37
@brooksprumo
Copy link
Contributor

Why backport?

Please see the problem description in the original PR here #33181, and the relevant comment from the first backport here #33212 (comment).

@codecov
Copy link

codecov bot commented Sep 13, 2023

Codecov Report

Merging #33221 (144e597) into v1.16 (c0dcc77) will decrease coverage by 0.1%.
The diff coverage is 100.0%.

@@            Coverage Diff            @@
##            v1.16   #33221     +/-   ##
=========================================
- Coverage    81.9%    81.9%   -0.1%     
=========================================
  Files         762      762             
  Lines      207824   207824             
=========================================
- Hits       170381   170364     -17     
- Misses      37443    37460     +17     

@brooksprumo
Copy link
Contributor

@t-nelson I'm planning on merging this PR at the end of the day. If you'd like me to wait, that's fine too, just let me know. Thanks!

@brooksprumo brooksprumo merged commit 60fcbc6 into v1.16 Sep 14, 2023
@brooksprumo brooksprumo deleted the mergify/bp/v1.16/pr-33181 branch September 14, 2023 12:43
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