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

feat: Add eth merge pause flag (to main) (backport #376) #377

Merged
merged 2 commits into from
Oct 1, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 1, 2022

This is an automatic backport of pull request #376 done by Mergify.
Cherry-pick of 8b19cf8 has failed:

On branch mergify/bp/release/v1.x.x/pr-376
Your branch is up to date with 'origin/release/v1.x.x'.

You are currently cherry-picking commit 8b19cf8.
  (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:   .mergify.yml
	modified:   cmd/peggo/flags.go
	modified:   cmd/peggo/orchestrator.go
	modified:   orchestrator/eth_event_watcher.go
	modified:   orchestrator/eth_event_watcher_test.go
	modified:   orchestrator/main_loops.go
	modified:   orchestrator/oracle_resync_test.go
	modified:   orchestrator/orchestrator.go

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

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

* chore: modify eth block delay (#367) (#368)

* chore: modify eth block delay

* chore: modify eth block delay

* fix test

* fix test

* changelog

* changelog

(cherry picked from commit 86ac6c4)

Co-authored-by: Facundo Medica <[email protected]>

* feat: reduce oracle noise msgs (#365) (#369)

* update test scripts

* reduce noise messages of pf

* add more providers to default

* add workflow for v1.0.x

* fix branch name

(cherry picked from commit 13fb428)

Co-authored-by: Rafael Tenfen <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>

* chore: prepare v1.1.0 release (#371)

* chore: prepare v1.1.0 release

* chore: prepare v1.1.0 release

* feat: Add eth merge pause flag

* fix

* fix add flag to cmd

* lint

* fix mergify

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rafael Tenfen <[email protected]>
(cherry picked from commit 8b19cf8)

# Conflicts:
#	CHANGELOG.md
@codecov-commenter
Copy link

codecov-commenter commented Oct 1, 2022

Codecov Report

Merging #377 (c7dc1cc) into release/v1.x.x (e086b3a) will decrease coverage by 0.12%.
The diff coverage is 14.28%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           release/v1.x.x     #377      +/-   ##
==================================================
- Coverage           57.81%   57.68%   -0.13%     
==================================================
  Files                  17       17              
  Lines                2041     2049       +8     
==================================================
+ Hits                 1180     1182       +2     
- Misses                758      763       +5     
- Partials              103      104       +1     
Impacted Files Coverage Δ
orchestrator/main_loops.go 7.44% <0.00%> (-0.02%) ⬇️
orchestrator/eth_event_watcher.go 76.71% <16.66%> (-1.70%) ⬇️
orchestrator/orchestrator.go 88.46% <100.00%> (+0.46%) ⬆️

@facundomedica facundomedica merged commit 18fde18 into release/v1.x.x Oct 1, 2022
@facundomedica facundomedica deleted the mergify/bp/release/v1.x.x/pr-376 branch October 1, 2022 19:34
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