Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

re-calibrate limit based on mainnet data (backport #21995)#22211

Merged
mergify[bot] merged 3 commits intov1.8from
mergify/bp/v1.8/pr-21995
Jan 3, 2022
Merged

re-calibrate limit based on mainnet data (backport #21995)#22211
mergify[bot] merged 3 commits intov1.8from
mergify/bp/v1.8/pr-21995

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Dec 31, 2021

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

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

You are currently cherry-picking commit d743c2917.
  (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/block_cost_limits.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

(cherry picked from commit d743c29)

# Conflicts:
#	runtime/src/block_cost_limits.rs
@mergify mergify bot added the conflicts label Dec 31, 2021
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Dec 31, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jan 1, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 3, 2022
@mergify mergify bot merged commit 84d535b into v1.8 Jan 3, 2022
@codecov
Copy link
Copy Markdown

codecov bot commented Jan 3, 2022

Codecov Report

Merging #22211 (e6d2665) into v1.8 (a53dd61) will decrease coverage by 0.0%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             v1.8   #22211     +/-   ##
=========================================
- Coverage    81.6%    81.5%   -0.1%     
=========================================
  Files         459      459             
  Lines      130962   130962             
=========================================
- Hits       106873   106857     -16     
- Misses      24089    24105     +16     

@mergify mergify bot deleted the mergify/bp/v1.8/pr-21995 branch January 3, 2022 19:03
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 3, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 3, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

automerge Merge this Pull Request automatically once CI passes conflicts locked PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant