Git

From ago control wiki
Jump to: navigation, search

Contents

Account

To request an account join #agocontrol-devel on freenode and talk to one of the Core Developers. We'll add self-enrollment soon. If you had an account on the old git, you need to go here to reset your password via email (press "Email password reset link" - this is needed because the old apache md5 hash can't be used with the new system): http://agocontrol.com/account

Should your email be wrong (I've fetched them from the git commits) please contact hari on irc.

Services

Repository

Gitlab

The repository runs on our local gitlab installation. You can access it here: http://git.agocontrol.com

Git Settings

Make sure to set your username and email:

git config --global user.email "your@mail.com"
git config --global user.name "Jim Smith"

Convenient settings:

git config --global push.default current

Cloning

git clone http://git.agocontrol.com/agocontrol/agocontrol.git

change branch to develop

cd agocontrol
git checkout -b develop origin/develop

Commit and push

git status
git add  <path/file>
git commit -m "<your comment>"
git push

Fork and Pull request

If you don't have rights to push to the main repo you can fork the project on Gitlab and issue a pull request. Make sure you have added your ssh key (see http://git.agocontrol.com/profile/keys for instructions). For example to clone your agocontrol / agocontrol file:

git clone git@git.agocontrol.com:<user>/agocontrol.git

Check your git config file so that it's using SSH. sudo nano .git/config

[remote "origin"]
       url=git@git.agocontrol.com:agocontrol/agocontrol.git

Wiki

Wiki logins now work with the developer accounts: http://wiki.agocontrol.com

Continuous Integration

Buildbot

Buildbot is currently used to build packages on every commit. It runs on our builder system: http://builder.agocontrol.com:8010

This is not tied into the new authentication system yet.

Gitlab CI

Gitlab-CI runs here: http://gitlab-ci.agocontrol.com This has integration into Gitlab. The nice thing is that every commit will have a build status (success/pending/failed). The downside is that it is far not as flexible as Buildbot. So this will not replace buildbot but augment it for quick testing of change sets.

Jenkins

A test installation is set up and allows login with the developer account. Contact hari on irc for further details.

Branching

I'd propose to adopt the branching model explained here: http://nvie.com/posts/a-successful-git-branching-model/

GIT Branching.png

Further discussion pending.

Personal tools