8

I've just moved from svn to github. Me and my team run local tests and we commit changes and test on a central dev server. Whenever we push changes to the repos I would like to automatically pull changes to any branches of my repos into folders on my dev server. This would enable me and my team to test and preview each others code using our central dev server.

Ideally, I could then map subdomains onto these different branch directories. I.e. If the branch was called 'refactor' i might check it using http://refactor.devserver.com

I guess this might involve a hook in my github configuration that triggers a script on the dev server? Perhaps i need to use a ci server like Hudson?

Edit : I can easily trigger a script to pull the master branch - what I need to do is pull any changed branches to separate root folders, so I'm able to test any branch easily through it's own subdomain. (Or some similar way to deploy and test any changed branches automatically)

Many thanks.

Boz
  • 1,178
  • 1
  • 12
  • 26

2 Answers2

12

Here is part of the answer to my own question...

I wanted the team to be able to fork the code and instantly be able to show it on a url like this : http://branch-name.devserver.com

I set up vhost directives in apache conf to map sub domains to folders :

<VirtualHost *:80>
        ServerName www.devserver.com
        ServerAlias *.devserver.com
        VirtualDocumentRoot /var/www/devserver/%1/
</VirtualHost>

I branch the code in github or on my local machine.
Then run these commands on the dev server

cd /var/www/devserver
git clone git@github.com:/user-name/repos-name

Move the cloned repos folder to a folder named the branch name so it becomes the root folder of the subdomain virtual host.

mv repos-name new-branch

Then switch the repos from master to the new branch

cd /var/www/devserver/new-branch
git checkout new-branch

It's now available on http://new-branch.devserver.com

Then after I've pushed changes to the branch on github - I pull them on the dev server

cd /var/www/devserver/new-branch
git pull

Now - if I want the pull to happen automatically I could setup a CI server to listen for a git hub hook which would trigger a pull in each branches folder. Looks like Hudson could do this.

I'd hoped to find a smarter way to do this :

  1. Without cloning the repos many times
  2. With a single command that updates all branches efficiently or a hook that lets me pull to only the branch that was updated
  3. With a decent folder structure for each branch - so I could test any branch on a specific url without having to mess about with http config every time I branch the code
  4. possibly automatically creating a root folder for new branches so that they would magically appear on the dev server

Any further thoughts welcome...

Boz
  • 1,178
  • 1
  • 12
  • 26
  • You can just clone the repository to a new folder directly, so you won't need to `mv` it. http://stackoverflow.com/questions/651038/how-do-you-clone-a-git-repository-into-a-specific-folder – Lg102 Aug 09 '13 at 08:53
1

It can certainly be done using Hudson if you have some automatic deploy procedure defined. In fact I have made a similar setup about a year ago - if changes were pushed into master Hudson made unit tests and if successful deployed to staging.

Paweł Obrok
  • 22,568
  • 8
  • 74
  • 70
  • I need to deploy and test any changed branches automatically. A possible solution i have in mind is to pull any changed branches to separate root folders, so I'm able to test any branch easily through it's own subdomain. Any ideas? – Boz Jul 24 '11 at 07:24
  • Just define a separate job in Hudson for each branch. Or do you mean that you also want Hudson to automatically detect new branches? In that case it may be more tricky. – Paweł Obrok Jul 24 '11 at 09:31
  • Hi obrok - I've answered my own question, please check my answer and comment if you can help further re. CI and automation - many thanks. – Boz Jul 26 '11 at 10:18