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

chore: price feeder imports umee/v2.0.0 (backport #766) #773

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 2022

This is an automatic backport of pull request #766 done by Mergify.
Cherry-pick of 11c0f76 has failed:

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

You are currently cherry-picking commit 11c0f76.
  (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:   price-feeder/go.mod
	modified:   price-feeder/oracle/client/client.go
	modified:   price-feeder/oracle/oracle.go
	modified:   price-feeder/oracle/oracle_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   price-feeder/go.sum

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

* all replaces EXCEPT in price feeder - not complete

* go mod replace price feeder 0.2

* fix make proto-gen output folder to allow major versions

* revert some price feeder path changes

* cannot find module providing package github.com/umee-network/umee/v2/app/params: import lookup disabled by -mod=readonly

* chore: pf importing umee/v2

* Update price-feeder/go.mod

* go mod tidy --compat=1.17

* try undo price feeder v2 import path

Co-authored-by: toteki <63419657+toteki@users.noreply.github.com>
(cherry picked from commit 11c0f76)

# Conflicts:
#	price-feeder/go.sum
@mergify mergify bot requested a review from a team as a code owner April 6, 2022 18:01
@mergify mergify bot added the conflicts label Apr 6, 2022
@toteki toteki closed this Apr 6, 2022
@mergify mergify bot deleted the mergify/bp/release/v2.x.x/pr-766 branch April 6, 2022 18:16
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