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

fix(migrate): fix cases where migrate engine was not stopped after an error #8482

Merged
merged 2 commits into from Aug 2, 2021
Merged

fix(migrate): fix cases where migrate engine was not stopped after an error #8482

merged 2 commits into from Aug 2, 2021

Conversation

Jolg42
Copy link
Member

@Jolg42 Jolg42 commented Jul 28, 2021

Closes #7795

@Jolg42 Jolg42 added this to the 2.29.0 milestone Jul 28, 2021
@Jolg42 Jolg42 marked this pull request as ready for review July 28, 2021 15:49
janpio
janpio approved these changes Jul 30, 2021
View reviewed changes
Copy link
Member

@janpio janpio left a comment

Choose a reason for hiding this comment

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

Seems to do the job!

Adds a lot of localized migrate.stop() though - is there maybe a way to handle this on a more global level that automatically runs after the local functionality is done, no matter if with an error or success?

@Jolg42
Copy link
Member Author

Jolg42 commented Aug 2, 2021

I agree this is not optimal, we can revisit the implementation in the future.

@Jolg42 Jolg42 merged commit 9236d0e into master Aug 2, 2021
@Jolg42 Jolg42 deleted the pr/migrate-remove-force-exit branch August 2, 2021 09:18
Jolg42 added a commit that referenced this pull request Aug 2, 2021
@Jolg42
Merge branch 'master' into migrate/log-from-engines
9890b46 
* master: (40 commits)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  fix(deps): update engines to v2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27
  chore(deps): update dependency @prisma/studio-server to v0.417.0
  chore(deps): update codecov-action action to v2 [skip ci] (#8352)
  chore(deps): update engines to 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 (#8412)
  ...
Jolg42 added a commit that referenced this pull request Aug 2, 2021
@Jolg42
Merge branch 'master' into pr/publish-for-major-bump
c752b02 
* master: (45 commits)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  fix(deps): update engines to v2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27
  chore(deps): update dependency @prisma/studio-server to v0.417.0
  chore(deps): update codecov-action action to v2 [skip ci] (#8352)
  ...

# Conflicts:
#	scripts/ci/publish.ts
Jolg42 added a commit that referenced this pull request Aug 2, 2021
@Jolg42
Merge branch 'master' into pr/remove-shadowed-vars
746e222 
* master: (50 commits)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  fix(deps): update engines to v2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27
  chore(deps): update dependency @prisma/studio-server to v0.417.0
  chore(deps): update codecov-action action to v2 [skip ci] (#8352)
  ...
Jolg42 added a commit that referenced this pull request Aug 3, 2021
@Jolg42
Merge branch 'master' into pr/db-seed-new-behavior
beca6e2 
* master: (21 commits)
  chore(deps): update engines to 2.29.0-7.10fbb58853d626be41afb2930e56e0a36afefb9f (#8538)
  chore: disable migrate logging
  feat(migrate): Allow migration engine to log to stdout (#7896)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  ...
Andrew-Colman pushed a commit to Andrew-Colman/prisma that referenced this pull request Aug 7, 2021
@Jolg42 @Andrew-Colman
fix(migrate): fix cases where migrate engine was not stopped after an…
4872111 
… error (prisma#8482)

* fix(migrate): fix cases where migrate engine was not stopped after an error

* more migrate stop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@janpio janpio janpio approved these changes

@millsp millsp Awaiting requested review from millsp

@williamluke4 williamluke4 Awaiting requested review from williamluke4

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

Successfully merging this pull request may close these issues.

Investigate and remove usage of --forceExit
2 participants
@Jolg42 @janpio