Skip to content

Commit

Permalink
Merge pull request #326 from CPSSD/release-0.3.0
Browse files Browse the repository at this point in the history
Release 0.3.0
  • Loading branch information
GoldenBadger authored Dec 3, 2017
2 parents 356ac17 + de556ea commit de80d3f
Show file tree
Hide file tree
Showing 79 changed files with 4,509 additions and 2,566 deletions.
23 changes: 23 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
dist: trusty
sudo: true

language: rust
rust:
- nightly
cache: cargo

addons:
apt:
packages:
- cmake
- golang

install:
- curl -OL https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip
- unzip protoc-3.5.0-linux-x86_64.zip -d protoc3
- sudo mv protoc3/bin/* /usr/local/bin/
- sudo mv protoc3/include/* /usr/local/include/

script:
- cargo build --verbose --all
- cargo test --verbose --all
42 changes: 24 additions & 18 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,39 @@ Writing Code for Cerberus

## Code Style ##

Rust does not have an offical code style guide. We will use the style guide currently in the rust-lang-nursery.
This style guide can be found [here](https://github.com/rust-lang-nursery/fmt-rfcs/blob/master/guide/guide.md).
- Rust does not have an official code style guide. We will use the style guide currently in the
[rust-lang-nursery](https://github.com/rust-lang-nursery/fmt-rfcs/blob/master/guide/guide.md).
- Protobufs should use our own 100 character line limit.
- Markdown files should follow sane styleguide, such as the one in [carwin/markdown-styleguide](https://github.com/carwin/markdown-styleguide),
with an exception of the line char limit, which is a 100.

## Code Formatting ##

All `rust` code checked into the repository must be formatted according to `rustfmt`.

## Commenting ##

Commenting will be done in accordance with the standard `rustdoc` style used for generating documentation.
You should write comments to explain any code you write that does something in a way that may not be obvious.
An explaination of standard Rust commenting practice and `rustdoc` can be found [here](https://doc.rust-lang.org/book/first-edition/documentation.html).
Commenting will be done in accordance with the standard `rustdoc` style used for generating
documentation. You should write comments to explain any code you write that does something in a
way that may not be obvious. An explanation of standard Rust commenting practice and `rustdoc` can
be found in [The Rust Programming Language book](https://doc.rust-lang.org/book/first-edition/documentation.html).

## Automated Testing ##

Automated unit/integration tests should be written using the rust testing framework.
Tests will be automatically ran for each pull request and pull requests with failling tests will not be merged.
Automated unit/integration tests should be written using the rust testing framework. Tests will be
automatically ran for each pull request and pull requests with failling tests will not be merged.

## Branching ##

Branching should be done in accordance with the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) style of branching.
There is a master branch and a develop branch. All features will be developed in feature branches off the develop branch.
Features will be merged into the develop branch when complete.
A release branch will be branched from the develop branch for final bugfixes before a release. When ready for a release it will be merged to the master branch.
Branching should be done in accordance with the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/)
style of branching. There is a master branch and a develop branch. All features will be developed
in feature branches off the develop branch. Features will be merged into the develop branch when
complete. A release branch will be branched from the develop branch for final bugfixes before
a release. When ready for a release it will be merged to the master branch.

## Merging ##
Before merging a branch into develop, all commits should be sqaushed to keep the history clean.

Before merging a branch into develop, all commits should be squashed to keep the history clean.
This should be done locally as the squash feature on github uses a fast forward merge.

## Version Numbering ##
Expand All @@ -40,10 +46,10 @@ according to the semantic versioning guidelines.

## Code Review ##

All code must be submitted via pull requests, *not* checked straight into the repo.
A pull request will be from a single feature branch, which will not be used for any other
features after merging. Ideally, it will be deleted after a merge.
All code must be submitted via pull requests, *not* checked straight into the repository. A pull
request will be from a single feature branch, which will not be used for any other features after
merging. Ideally, it will be deleted after a merge.

All pull requests must be reviewed by at least two people who are not the submitter. You can
ask in Slack for a review, or use Github's assign feature to assign the pull request to a
specific person.
All pull requests must be reviewed by at least two people who are not the submitter. You can ask
in Slack for a review, or use Github's assign feature to assign the pull request to a specific
person.
Loading

0 comments on commit de80d3f

Please sign in to comment.