I am using Cloud66 that gives me both the advantage. I push code to github and Cloud66 deploy to Digital Ocean. It's very easy to use and I don't need to manage my server at all. I was using Heroku before, now I am completely satisfied.

PS: If you want to try this is my referral code (10$ off): https://app.cloud66.com/referral?code=IOwgnqPHIEJwEzG