In a way, my setup doesn't automate deployments - i.e. you never inadvertently deploy by committing some code or merging a PR (when your intent was merely approving some code).

That's why I made the master vs. master-xxx distinction: deployments are an explicit action, which you are free to defer as needed.