Skip to content

Commit

Permalink
setup develop branch with travis and version bump (#487)
Browse files Browse the repository at this point in the history
* setup develop branch with travis and version bump
  • Loading branch information
FFroehlich committed Dec 12, 2018
1 parent c6a3345 commit d5272d2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -4,7 +4,7 @@ sudo: required
branches:
only:
- master
- staging
- develop

matrix:
fast_finish: true
Expand Down
7 changes: 4 additions & 3 deletions CONTRIBUTING.md
Expand Up @@ -7,17 +7,18 @@ We are happy about contributions to AMICI in any form (new functionality, docume
When making code changes:

* Check if you agree to release your contribution under the conditions provided in `LICENSE`
* Start a new branch from `master`
* Start a new branch from `develop`
* Implement your changes
* Submit a pull request
* Submit a pull request to the `develop` branch
* Make sure your code is documented appropriately
* Run `mtoc/makeDocumentation.m` to check completeness of your documentation
* Make sure your code is compatible with C++11, `gcc` and `clang`
* when adding new functionality, please also provide test cases (see `tests/cpputest/`)
* Write meaningful commit messages
* Run all tests to ensure nothing got broken
* Run all tests to ensure nothing was broken
* Run `tests/cpputest/wrapTestModels.m` followed by CI tests `scripts/buildAll.sh && scripts/run-cpputest.sh`
* Run `tests/testModels.m`
* Run `make python-tests` in `build`
* When all tests are passing and you think your code is ready to merge, request a code review

## Adding/Updating tests
Expand Down
2 changes: 1 addition & 1 deletion version.txt
@@ -1 +1 @@
0.8.1
0.8.2

0 comments on commit d5272d2

Please sign in to comment.