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.

Sign up for GitHub

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

Jump to bottom

fixes multiple Alembic heads #6051

Merged
merged 1 commit into from Jul 28, 2021
Merged

fixes multiple Alembic heads #6051

merged 1 commit into from Jul 28, 2021

Conversation

cfm
Copy link
Member

@cfm cfm commented Jul 28, 2021 •
edited

Status

Ready for review

Description of Changes

Fixes #6050 by rebasing (if you will) Alembic revision 1ddb81fb88c2 (#5974) onto b060f38c0c31 (#5954).

Testing

  1. alembic upgrade head succeeds.
  2. All Alembic-based tests in app-tests and staging-test-with-rebase pass.

Deployment

No special considerations.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

@cfm cfm requested a review from a team as a code owner July 28, 2021 20:03
rmol
rmol approved these changes Jul 28, 2021
View reviewed changes
Copy link
Contributor

@rmol rmol left a comment

Choose a reason for hiding this comment

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

Good catch. Can be merged when CI passes.

@eloquence
Copy link
Member

Looks like a potential test flake with everyone's favorite CI job, staging-test-with-rebase, that was previously reported here:
#5907 (comment)

Re-running, if it is a flake, we should track separately.

@sssoleileraaa sssoleileraaa merged commit 3789cd9 into develop Jul 28, 2021
@sssoleileraaa sssoleileraaa deleted the multiple-alembic-heads branch July 28, 2021 23:08
@cfm cfm mentioned this pull request Jul 28, 2021
Merged
6 tasks
@eloquence eloquence mentioned this pull request Aug 2, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rmol rmol rmol approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Alembic operations fail with multiple head revisions
4 participants
@cfm @eloquence @rmol @sssoleileraaa