Skip to content

Home

Jump to bottom
John Mercier edited this page Jan 28, 2017 · 30 revisions

Welcome to the graph-dsl wiki! graph-dsl is a quick and easy way to create graphs and perform algorithms on them. It creates a traditional set of vertices and edges and provides a lot of groovy magic to deal with them.

#Status Master

  • Build Status Develop
  • Build Status

#Continuous Integration

graph-dsl uses travis-ci to build, test, and run static code analysis for sonarqube.

Development

Workflow

This project uses gitflow-avh with github pull requests. For these to work together some rules should be followed.

  • Pull requests are used to run checks and allow comments. Sonar adds comments for issues it finds.
  • If a pull request resolves and issue it should have (resolve #X) to close the issue in github when it is merged.
  • For features pull requests should be made against develop.
  • For releases and hotfixes pull requests should be made against master.
  • Releases should be made for each feature merged. There should only be bug fixes release branch.
  • Documentation should be updated to reflect the new release.
  • Internal pull requests should not be merged through github.com. Instead, use gitflow to do the merge. Once gitflow merges the branches, github.com should be automatically marked as merged by github.com.

I'm not sure how to handle external pull requests yet.

Issue with pull requests

The normal gitflow workflow breaks pull requests in github. Here is the workaround.

//use the -k flag to keep the feature branch
git flow feature finish test -k
//after all the merging is done, the PR should be marked as 'merged', so you can delete the remote branch
git flow feature delete test -r
Clone this wiki locally