Skip to content

Commit

Permalink
Merge pull request #111 from CPSSD/release-0.1
Browse files Browse the repository at this point in the history
Release 0.1
  • Loading branch information
GoldenBadger authored Oct 22, 2017
2 parents 04f5b67 + d55c283 commit 8e58db8
Show file tree
Hide file tree
Showing 49 changed files with 6,462 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pipeline:
test:
image: goldenbadger/cerberus-ci
pull: true
commands:
- cargo build --all
- cargo test --all
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cargo.lock linguist-generated
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
# Unignore all with extensions
!*.*

# Unignore Dockerfile
!Dockerfile

# Unignore all dirs
!*/

Expand All @@ -14,3 +17,13 @@ target/

# These are backup files generated by rustfmt
**/*.rs.bk

# Ignore common accidental extensions
*.swp

# Ignore all files in proto/src which are auto-generated
proto/src/*
!proto/src/lib.rs

# Unignore makefiles
!Makefile
49 changes: 49 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
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).

## 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).

## 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.

## 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.

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

## Version Numbering ##

We will be using [semantic versioning](http://semver.org/). Every binary will have a separate
version number (server, client, etc.). This will begin at 0.1.0 and will be incremented strictly
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 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 8e58db8

Please sign in to comment.