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

Fix/unbreak changes #37

Closed
wants to merge 8 commits into from
Closed

Fix/unbreak changes #37

wants to merge 8 commits into from

Conversation

joshbax189
Copy link
Contributor

Release 2.0.1 sucked in unreleased breaking changes that were sitting in master.

This massages the breaking changes to be backwards compatible, hence release version 2.1.0.

Alternately we could just git revert the breaking commit and release 2.0.2 to fix the bad 2.0.1 release

encodingVersion?: EncodingVersions;
}): Promise<Uint8Array | null> {
const phrase = key || passphrase;
Copy link
Contributor

Choose a reason for hiding this comment

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

we only need to _deriveKeyWithOptions, if its passphrase,
if it's already a key , then all we need is EncryptionKey class object out of it and don't need to _deriveKeyWithOptions
https://github.com/Meeco/cryppo-js/blob/610f14507c2ea58916eff8212b85277f52b6f17a/src/encryption-key.ts

@zbarbuto
Copy link
Contributor

My opinion is if 2.0.1 included breaking changes by mistake then revert and release as 2.0.2 then release those breaking changes as actual breaking changes (3.0.0)

The fix that was in the original 2.0.1 can then be applied and rolled out as a 2.0.3 and 3.0.1

@joshbax189
Copy link
Contributor Author

Ok here's what I'll do:

  • create branch develop using latest master branch
  • cherry pick the fix onto tag releases/2.0.0 -> tag it releases/2.0.2
  • force push master to releases/2.0.2

Branch develop will have the unreleased changes, Branch master will have the latest released changes and release 2.0.2 will have the (unbreaking as intended) changes from the fix

@zbarbuto
Copy link
Contributor

I approve that approach 👍

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

Successfully merging this pull request may close these issues.

3 participants