search

JonathanReeve / sanger

Margaret Sanger Papers Project Search Engine
0 stars 3 forks source link

better automated git pulling on server #65

Open JonathanReeve opened 9 years ago

JonathanReeve commented 9 years ago

There might be a way to have every GitHub commit to master automatically push these changes to the server. DigitalOcean seems to have a guide: https://www.digitalocean.com/community/tutorials/how-to-set-up-automatic-deployment-with-git-with-a-vps.

JonathanReeve commented 9 years ago

This is mostly working now with some server magic. Updating the master branch on this repository will automatically send changes to the server--no need to log in and pull in the changes there.

This could still use a lot of work, though--it could check that the request is coming from github, check secrets if necessary, and differentiate between master and develop branches.

JonathanReeve commented 9 years ago

Gist for this.

CathyHajo commented 9 years ago

Not working right for me. I tried to correct a document --421997.xml-- and tried to commit and sync, but got an error on the sync: "Failed to sync this branch. You might need to open a shell and debug the state of this repo."

I thought it might be because Esther recently edited the file. Back in GitWin interface I saw another set of uncommitted changes with the title "Merge remote-tracking branch 'origin/master'" After that happened, I tried to edit a new doc (421058) and committ just that one, because I knew there weren't any issues, but I got an error that again prompted me to the GitShell/debug.