Merged
Conversation
* fix for triggers in lightning * changeset * trigger
* feat: workflow merge compatibility * feat: push version history * fix: log level when calling checkout from merge * feat: add history to workflow property * tests: update wording * feat: update history checking logic * tests: update tests
* changeset * feat: workflow merge compatibility * feat: add history to workflow property * feat: error when there are incompatible workflows * feat: ignore incompatibility when force passed * tests: fix workflow check * tests: incompatibility merging via project class * tests: fix error wording * chore: updates * conflict * changeset --------- Co-authored-by: Farhan Yahaya <yahyafarhan48@gmail.com>
* trying to enable old json formats * refactor project.repo to project.config * changeset * test and refactor in workspace * make project meta public * new helper to load workspace file * standardise workflow.yaml loading * update new format for openfn.yaml * fix types * suppress error logging * types * cli: fix config * fix tests * track project name in legacy config files * track project name from app state * update test * fix more tests * fix empty workspace files
Collaborator
Author
|
Dang, genuine unit test fail here :( Something must have crept up in the merges |
* purge staes cache * remove state entirely - just use context * tidy up and tweak test * restructure * add timestamps to events * performance tests * tidy and changeset * comments
* force merge by default In the CLI, we only force merge when the user asks us to. But here in project, we prefer to force merge. If you ask to merge two projects, we just merge them. Why woulldn't we? Add safeguads in the application, not down in the API If it feels like a strange default its because the CLI should be doing all the force stuff, not the Project, but there we go * force where needed * update integration test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.