search

hapipal / boilerplate

A friendly, proven starting place for your next hapi plugin or deployment
https://hapipal.com
184 stars 26 forks source link

Update deployment flavor #79

Closed Nargonath closed 5 years ago

Nargonath commented 5 years ago

I just boostrapped a project using the CLI and used the deployment flavor. I noticed the flavor is not using the @hapi scoped package. I'd be happy to update it but I wondered what is the preferred workflow for it. I noticed there is a flavor-deployment branch and also the tag we cherry-pick. My guess is that you make the change on the branch, commit and after that you update the deployment tag (if I have the right to do it) on the HEAD of that branch, is that correct?

Thanks 👍

devinivy commented 5 years ago

Thanks! Just wanted to let you know I see this and it's on my todo list for this upcoming week, alongside closing out #78 (cc @timcosta).

Nargonath commented 5 years ago

Alright, I'd be happy to make the PR but is the process I mentioned the way to go?

devinivy commented 5 years ago

Yeah, exactly. We keep everything up to date on the flavor branch, then when it's time to "publish" we merge the pal branch into it, squash the diff between the flavor branch and the pal branch into a single commit, then tag it for cherry-picking. It's somewhat documented here https://gist.github.com/devinivy/d0d403c85ba8e2b1eb59f01a6b497a24

I don't think there's any need for a PR at the moment, since we did actually make those changes on the flavor branch. I think I must have botched publishing the flavor.

Nargonath commented 5 years ago

Thanks for the workflow explanation.

Yeah indeed you are right. I only checked the tag but not the branch, my bad.

devinivy commented 5 years ago

This should be fixed in v2.3.1 of the flavor 👍