Skip to content

Latest commit

 

History

History
198 lines (137 loc) · 6.25 KB

CONTRIBUTING.md

File metadata and controls

198 lines (137 loc) · 6.25 KB

Contributing

gopass uses GitHub to manage reviews of pull requests.

Steps to Contribute

Should you wish to work on an issue, please claim it first by commenting on the GitHub issue you want to work on it. This will prevent duplicated efforts from contributors.

Please check the help-wanted label to find issues that need help. If you have questions about one of the issues please comment on them and one of the maintainers will try to clarify it.

Pull Request Checklist

  • Use that latest stable Go release

  • Branch from master and, if needed, rebase to the current master branch before submitting your pull request. If it doesn't merge cleanly with master you will be asked to rebase your changes.

  • Commits should be as small as possible, while ensuring that each commit is correct independently.

  • Add tests relevant to the fixed bug or new feature.

  • Add a DCO / Signed-off-by line in any commit message.

Building & Testing

  • Build via go build to create the binary file ./gopass.
  • Run unit tests with: make test
  • Run meta tests with: make codequality
  • Run integration tests make test-integration

If any of the above don't work check out the troubleshooting section.

Releasing

This section is a reference for contributors with write access to the gopass repository.

Preparation

In order to release gopass we currently rely on a patched version of goreleaser. While most of our customizations have been submited and merged upstream some had to be changed to be accepted and others were rejected. We'd like to switch back to vanilla goreleaser in the future, but this requires some tweaks to the build and release process.

# Install our modified version of goreleaser
go get -u github.com/goreleaser/goreleaser
cd $GOPATH/src/github.com/goreleaser/goreleaser
git remote add gopass [email protected]:gopasspw/goreleaser.git
git fetch gopass
git checkout gopass
git pull gopass gopass
go install

Releasing a new minor release

This subsection applies to major or minor releases, i.e. incrementing X or Y in X.Y.Z. This is the regular release process.

We develop new features and fixes and feature branches which are frequently merged into master in our own forks of the repository.

Important: Do not push and feature branches to the main repo.

# Change in to the repository
cd $GOPATH/src/github.com/gopasspw/gopass

# Update the Changelog
# TODO: Update CHANGELOG.md

# Update the version
echo v1.X.Y > VERSION
git commit -am'Tag v1.X.Y'

# Tag the new version
git tag -s v1.X.Y

# Generate shell completion files
make completion

# Do a release dry run to detect possible issues
goreleaser --skip-publish

# Push the tag to GitHub
git push origin v1.X.Y

# Build and push the release
GITHUB_TOKEN=ABC goreleaser

# Update the gopass website
# TODO: Update gopasspw.github.io

After these steps are complete please edit the auto-generated GitHub release description and make it match the current CHANGELOG entry.

Releasing a patch level release

This subsection applies to patch level releases, i.e. incrementing Z in X.Y.Z.

If we need to release a patch release and can not base this upon the master branch because there have been changes which should not be included in the patch release (e.g. new features) we need to summon a new release branch from a past release tag. Then we cherry-pick or port the required fixes to this branch and create a release from it.

Tips for cherry-picking:

  • Keep the changes small and self contained
  • Squashed commits per feature help (one commit per fix/feature)
  • Keep them in order
git checkout vX.Y.Z
git checkout -b release-X.Y
git cherry-pick ABC
git cherry-pick DEF
git cherry-pick FFF
make travis
# TODO: Update CHANGELOG.md and VERSION in ONE COMMIT
git commit -am'Tag X.Y.Z+1'
git tag -s vX.Y.Z+1
goreleaser --skip-publish
git push origin vX.Y.Z+1
GITHUB_TOKEN=ABC goreleaser
git push origin release-X.Y

After these steps are complete please edit the auto-generated GitHub release description and make it match the current CHANGELOG entry.

Troubleshooting

Vendoring

This project use dep to manage it's dependencies. See this gist for a quick overview.

Docker Approach

gopass ships a ready to use Dockerfile based on Alpine. It allows to run tests and build gopass without having to setup a Go stack on the host.

cd $GOPATH/src/github.com/gopasspw/gopass
make docker-test

You can also run an interactive shell inside the container via:

docker run --rm -ti gopass sh

It is also possible mount a local directory into the container to copy files in and out of it, but please pay attention to permissions.

docker run -it -v "$PWD":/go/src/github.com/gopasspw/gopass -w /go/src/github.com/gopasspw/gopass gopass sh

Please note that it is not recommended to actually use gopass inside Docker as there are issues with random number generation in general and GnuPG.

Setup of your local environment

Quick Start:

  • mkdir -p $HOME/go/src
  • export GOPATH=$HOME/go
  • go get -u github.com/gopasspw/gopass
  • Set $GOROOT depending on your OS and Go installation method:
    • MacOS, Go installed via brew: export GOROOT=/usr/local/opt/go/libexec/
  • Now you should be able to build from the gopass dir:
    • cd $GOPATH/src/github.com/gopasspw/
    • go build -v