Ensure HRO cloud servers can be deployed from the same branch as the other grid instances
The current hro-config
branch is a old fork of develop
.
Since commit e9a2cec7, this branch has been deployed a few times by Jehad but has never been updated as develop
has.
The reason is likely due to the conflict introduced at the fork in which we've chosen to alter the production grid to match the deployment of HRO Cloud grid.
A better option has been proposed here by @jcalderone:
I think the right path forward is to start a new branch off develop and integrate the HRO Cloud configuration as a new grid (instead of as changes to the production grid), then actually merge this branch to develop.
Alternatively, we could try to edit the few commits in hro-config
branch (changing paths) so we can merge it to develop
with conflict with the current production for PS (while keeping some relevant history, maybe).
Either way, the goal is the same.