First, thank you for taking the time to contribute!
The following is a set of guidelines for contributors as well as information and instructions around our maintenance process. The two are closely tied together in terms of how we all work together and set expectations, so while you may not need to know everything in here to submit an issue or pull request, it's best to keep them in the same document.
Contributing isn't just writing code - it's anything that improves the project. All contributions for Distributor are managed right here on GitHub. Here are some ways you can help:
If you're running into an issue with the plugin, please take a look through existing issues and open a new one if needed. If you're able, include steps to reproduce, environment information, and screenshots/screencasts as relevant.
New features and enhancements are also managed via issues.
Pull requests represent a proposed solution to a specified problem. They should always reference an issue that describes the problem and contains discussion about the problem itself. Discussion on pull requests should be limited to the pull request itself, i.e. code review.
For more on how 10up writes and manages code, check out our 10up Engineering Best Practices.
The develop
branch is the development branch which means it contains the next version to be released. stable
contains the current latest release and master
contains the corresponding stable development version. Always work on the develop
branch and open up PRs against develop
.
- Version bump: Bump the version number in
distributor.php
if it does not already reflect the version being released. Ensure that it is suffixed with-dev
. - Changelog: Add/update the changelog in
CHANGELOG.md
- Merge: Make a non-fast-forward merge from
develop
tomaster
.master
contains the stable development version. - Build: In the
master
branch, runnpm run release
. This will create a subfolder calledrelease
with thestable
branch cloned into it as a worktree and latest changes copied over. Ensure that any new files are in therelease
folder; if not, you may need to add them togulp-tasks/copy.js
. - Check: Are there any modified files, such as
distributor.pot
? If so, head back todevelop
, run all necessary tasks and commit those changes before heading back to step 3. - Test: Switch to running Distributor from the version in the
release
subfolder and run through a few common tasks in the UI to ensure functionality. - Push: From within the
release
directory, add all files and push them toorigin stable
. - Git tag: Tag the release as
X.Y.Z
on thestable
branch in Git and push the tag to GitHub. It should now appear under releases as well. - Version bump (again): Bump the version number in
distributor.php
toX.Y.(Z+1)-dev
. It's okay if the next release might be a different version number; that change can be handled right before release in the first step, as might also be the case with@since
annotations.