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: upgrade sdk with app version fix for state-sync (backport #1570) #1574

Merged
merged 2 commits into from
May 25, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 25, 2022

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

On branch mergify/bp/v9.x/pr-1570
Your branch is up to date with 'origin/v9.x'.

You are currently cherry-picking commit 1510160.
  (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:   CHANGELOG.md
	modified:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   app/upgrades/v9/upgrades.go

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

Closes: #XXX

## What is the purpose of the change

Upgrade SDK with the app version change and set the app version in the upgrade handler

## Testing and Verifying

- e2e test for state sync is in progress: #1572
- upgrade itself is verified by the existing e2e test
- needs manual testing

## Documentation and Release Note

  - Does this pull request introduce a new feature or user-facing behavior changes? yes
  - Is a relevant changelog entry added to the `Unreleased` section in `CHANGELOG.md`? yes
  - How is the feature or change documented? not applicable

(cherry picked from commit 1510160)

# Conflicts:
#	app/upgrades/v9/upgrades.go
@mergify mergify bot requested a review from a team May 25, 2022 01:13
@mergify mergify bot added the conflicts label May 25, 2022
@codecov-commenter
Copy link

codecov-commenter commented May 25, 2022

Codecov Report

Merging #1574 (2d53d10) into v9.x (e0ab1db) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##             v9.x    #1574      +/-   ##
==========================================
- Coverage   19.67%   19.67%   -0.01%     
==========================================
  Files         241      241              
  Lines       31840    31842       +2     
==========================================
  Hits         6264     6264              
- Misses      24424    24426       +2     
  Partials     1152     1152              
Impacted Files Coverage Δ
app/upgrades/v9/upgrades.go 16.66% <0.00%> (-8.34%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e0ab1db...2d53d10. Read the comment docs.

@p0mvn p0mvn merged commit 1a999e2 into v9.x May 25, 2022
@p0mvn p0mvn deleted the mergify/bp/v9.x/pr-1570 branch May 25, 2022 01:37
Copy link
Contributor

@alexanderbez alexanderbez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants