Skip to content

Latest commit

 

History

History
74 lines (59 loc) · 4.58 KB

CONTRIBUTING.md

File metadata and controls

74 lines (59 loc) · 4.58 KB
Raw

About to create a new Github Issue?

We appreciate that. But before you do, please learn our basic rules:

  • This is not a support or discussion forum. If you have a question, please ask it on The Cukes Google Group or on Gitter.
  • Do you have a feature request? Then don't expect it to be implemented unless you or someone else sends a pull request.
  • Reporting a bug? We need to know what compiler, operating system and architecture (32 or 64 bit) you are using, including versions of all libraries. Bugs with pull requests get fixed quicker. Some bugs may never be fixed.
  • You have to tell us how to reproduce a bug. Bonus point for a pull request with a failing test that reproduces the bug.
  • Want to paste some code or output? Put ``` on a line above and below your code/output. See GFM's Fenced Code Blocks for details.
  • We love pull requests, but if you don't have a test to go with it we probably won't merge it.

Contributing

Before you can contribute, you have to be able to build the source and run tests.

The Github Process

The process for using git/github is similar to the Github-Flow

  • Anything in the master branch is good enough to release
  • Working on nontrivial features
    • Create a descriptively named branch off of master
    • Commit to that branch locally and regularly
    • Push your work to the same named branch on the server
    • Regularly rebase this branch from master to keep it up to date
  • Open a pull request
    • When you need feedback or help
    • You think the branch is ready for merging (you can use the hub command-line tool)
  • For any nontrivial change, even if you have the rights to merge the pull request yourself, wait before someone else has reviewed and agreed on the change

Here is an Example of this process in action

Tips for good commits

  1. Read up on Github Flavored Markdown
    • Especially links and syntax highlighting. GFM can be used in tickets as well as commit messages (e.g. put "#4" somewhere in a commit message to link ticket 4 to that commit
  2. Close tickets with commits if you can
  3. Subscribe to ticket feeds so you stay in the loop and get a chance to provide feedback on tickets
  4. The code standard is the existing code
    • Use the same indentation, spacing, line ending, ASCII for source code, UTF-8 everywhere else
  5. Use git diff (or git diff --cached if you have staged) before every commit
    • This helps you avoid committing changes you didn't mean to

Maintainers' guide

Merge a PR

  • Verify that:
    • All checks have passed
    • At least one maintainer has approved any non-trivial change, and a discussion has occurred for any breaking change
    • The branch does not need rebasing or squashing of commits
  • To merge:
    • Follow the command line instructions on GitHub
    • If it is either a new feature or a bugfix, specify the --no-commit flag when merging and add a line to CHANGELOG.md following the current convention. Add this file to the changes to be committed and commit the merge.
    • Commit message should follow the current convention: Merge #42 'Description of the change usually from the PR description'

Do a release

  • Release commit (e.g. fdf8a5c):
    • Change CHANGELOG.md renaming the "In Git" section with the release number and date
    • Commit with message Update changelog for the X.Y release
    • Create an annotated tag for this commit named vX.Y
  • New development branch commit (e.g. da60995):
    • Add new "In Git" section to CHANGELOG.md
    • Commit with message Preparing history file for next development release
  • Push commits and tags to master