-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'enhancement/documentation' into develop
- Loading branch information
Showing
3 changed files
with
177 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# HRSWP Employee Recognition | ||
|
||
Author: Adam Turner | ||
Author: Washington State University | ||
URI: https://github.com/washingtonstateuniversity/hrswp-employee-recognition | ||
|
||
<!-- | ||
Changelog formatting (http://semver.org/): | ||
## Major.MinorAddorDeprec.Bugfix YYYY-MM-DD | ||
### Added (for new features.) | ||
### Changed (for changes in existing functionality.) | ||
### Deprecated (for soon-to-be removed features.) | ||
### Removed (for now removed features.) | ||
### Fixed (for any bug fixes.) | ||
### Security (in case of vulnerabilities.) | ||
--> | ||
|
||
## 0.1.0-alpha.1 (:construction: TBD) | ||
|
||
### Added | ||
|
||
- Add readme, contributing guidelines, and changelog. | ||
- Rename `LICENSE` to `LICENSE.md` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# Contributing and Maintaining | ||
|
||
Thanks for contributing! | ||
|
||
The following guidelines outline how to contribute and provide instructions about our workflow and release processes. | ||
|
||
## Ways to contribute | ||
|
||
Contributing includes reporting problems with the plugin, suggesting improvements or new features, or submitting pull requests with new code. All contributions are managed here on GitHub. Here are some ways you can help: | ||
|
||
### Reporting bugs | ||
|
||
If you run into an issue with the plugin, please take a look through [existing issues](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/issues) and [open a new one](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/issues/new/choose) if needed. If you're able, include steps to reproduce, environment information, and screenshots/screencasts as relevant. | ||
|
||
### Suggesting enhancements | ||
|
||
New features and enhancements are also managed via [issues](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/issues/new/choose). Select "Feature request" and complete the form as applicable. | ||
|
||
### Pull requests | ||
|
||
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. | ||
|
||
## Documenting changes | ||
|
||
### Commits | ||
|
||
Commits should be small, individual items of work. They should focus distinctly on one type of change and be separate from other features. Each commit must include a short (no more than 70 characters) commit message summarizing the change. A longer description is optional. | ||
|
||
### Semantic Versioning & Human-friendly Changelogs | ||
|
||
We follow the [Semantic Versioning pattern](https://semver.org/) when assigning version numbers. Each version number must have three digits (including zero) in the <major>.<minor>.<patch> format, where: | ||
|
||
We follow the [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) standard when maintaining changelogs. | ||
|
||
## Workflow | ||
|
||
The `develop` branch is the development branch, which means it contains the next version to be released. The `stable` branch contains the current latest release. Always work on the `develop` branch and open pull requests against `develop`. | ||
|
||
### `Stable` and `Develop` branches | ||
|
||
The stable branch stores the official release history, while the develop branch serves as an intermediary between feature branches and stable. All branches – except hotfixes – are branched off of develop instead of stable. | ||
|
||
Changes should never be pushed directly to the stable branch. New features should be branched off of develop and, when complete, merged back into develop using a non-fast-forward merge. | ||
|
||
### Develop on `feature` branches | ||
|
||
Create a new branch from develop for development work. Feature branches should be given short names prefixed with the appropriate label for the type of change they introduce, such as `fix/name-of-issue` or `enhancement/update-to-feature`. We have a minimal set of labels, which we’ll add to and clean up as needed: | ||
|
||
- fix: Correct something that isn’t worked. | ||
- feature: A new feature. | ||
- enhancement: Modification of existing functionality or features. | ||
- documentation: Improvement or addition to documentation. | ||
- dependencies: Changes to dependency files. | ||
- management: Updates to project-level settings. | ||
|
||
Make frequent, small commits to the feature branch. Frequently check develop against the feature branch to keep up with changes other developers are working on. When finished with the feature, merge the feature branch back into develop using a non-fast-forward merge (--no-ff): `git checkout develop && git merge --no-ff <label>/<feature-name>`. | ||
|
||
### Deploying with `release` branches | ||
|
||
When the develop branch is ready to be merged into stable as a new release, create a new `release/<version>` branch off of develop. In the `release/<version>` branch you will: | ||
|
||
1. First bump version numbers to `<version>-rc.1`. | ||
1. Update the changelog in CHANGELOG.md. | ||
1. Update documentation. | ||
1. Push the release branch to GitHub and create a pre-release targeting the release branch. Tag the pre-release `v<version>-rc.1`, title it `<version> RC 1` and copy the Changelog contents for the release into the description. | ||
1. Use the release branch and the build RC 1 version to run tests and fix bugs. No new features will be added on this branch. | ||
1. Once testing is finished, increment the version numbers again, to `<version>`, and update the changelog and any other docs if changes were made during testing. | ||
1. Open a new pull request to merge `release/<version>` into stable. Title it `<version>` and complete the PR template as needed. When the pull request is ready, non-fast forward merge it into stable (or select “Merge pull request” in GitHub): `git checkout stable && git merge --no-ff release/<version> && git push origin stable` | ||
1. Create a new release in GitHub targeting the stable branch. Tag the release `v<version>`, title it `<version>`, and copy the Changelog contents for the release into the description. | ||
1. Last, merge stable back into develop with a --no-ff merge so that it contains any changes made on the release branch. | ||
|
||
### Emergency patching with `hotfix` branches | ||
|
||
Critical maintenance and fixes are implemented thorugh hotfix branches. These are the only branches made directly off the stable branch. They operate much like release branches, but their parent is the stable branch instead of develop. As soon as the fix is complete it is merged into stable and a new release is made. Then stable is merged into develop to keep both up to date. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
# HRSWP Employee Recognition | ||
|
||
## Overview | ||
|
||
A WSU Human Resource Services WordPress plugin that helps to manage the employee recognition progmam. | ||
|
||
## Description | ||
|
||
- CRUD process for ER length-of-service awards. | ||
- Inventory management for ER length-of-service awards. | ||
|
||
## Installation | ||
|
||
This plugin is not in the WordPress plugins directory. You have to install it manually either with SFTP or from the WordPress plugins screen: | ||
|
||
1. [Download the latest version from GitHub](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/releases/latest) and rename the zip file to: `hrswp-employee-recognition.zip`. | ||
2. From here you can either extract the files into your plugins directory via SFTP or navigate to the Plugins screen in the admin area of your site to upload it through the plugin uploader (steps 3-5). | ||
3. Select Plugins > Add New and then select the "Upload Plugin" button. | ||
4. Select "Browse" and locate the downloaded zip file for the plugin (it **must** be a file in `.zip` format) on your computer. Select "Install Now." | ||
5. You should receive a message that the plugin installed correctly. Select "Activate Plugin" or return to the plugins page to activate later. | ||
|
||
### Updates | ||
|
||
Please note that this plugin will not update automatically and will not notify of available updates. It is your responsibility to make sure you stay up to date with the latest version. It does include a GitHub repository URL in the Update URI field, so if you have a plugin that can update from GitHub then this plugin should be compatible with that. | ||
|
||
### Deactivating and Deleting: Plugin Data | ||
|
||
|
||
## For Developers | ||
|
||
The plugin development environment uses the [WordPress Scripts](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/) package and relies on NPM and Composer. The `package.json` and `composer.json` manage necessary dependencies for testing and building. The scripts in `package.json` interface with the WP Scripts package to do most of the heavy lifting. | ||
|
||
### Initial Setup | ||
|
||
1. Clone the plugin to a directory on your computer. | ||
2. Change into that directory. | ||
3. Install the NPM and Composer dependencies. | ||
4. Ensure linting and coding standards checks are working -- this should exit with zero (0) errors. | ||
5. Create a new branch for local development. | ||
|
||
In a terminal: | ||
|
||
~~~bash | ||
git clone https://github.com/washingtonstateuniversity/hrswp-employee-recognition.git | ||
cd hrswp-employee-recognition | ||
npm install | ||
composer install | ||
npm test -s | ||
git checkout -b new-branch-name | ||
~~~ | ||
|
||
### Build Commands | ||
|
||
The following commands will handle basic build functions. (Remove the `-s` flag to show additional debug info.) | ||
|
||
- `npm run build`: Transforms source code so it’s consolidated and optimized for production. | ||
- `npm run lint`: Check all PHP, JS, and CSS files for coding style compliance. | ||
- `npm run export`: Creates a zip file of the plugin for installation. | ||
|
||
See the scripts section of `package.json` for additional available commands. | ||
|
||
## Issues | ||
|
||
Please submit bugs, fixes, and feature requests through [GitHub Issues](https://github.com/washingtonstateuniversity/hrswp-plugin-documents/issues). Please read (and adhere to) the guidelines for contributions detailed in the issue templates. | ||
|
||
Read the [CHANGELOG.md](https://github.com/washingtonstateuniversity/hrswp-plugin-documents/blob/stable/CHANGELOG.md) to review release and update notes. | ||
|
||
## Support Level | ||
|
||
**Active:** WSU HRS actively works on this plugin. We plan to continue work for the foreseeable future, adding new features, enhancing existing ones, and maintaining compatability with the latest version of WordPress. Bug reports, feature requests, questions, and pull requests are welcome. | ||
|
||
## Changelog | ||
|
||
All notable changes are documented in the [CHANGELOG.md](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/blob/develop/CHANGELOG.md), with dates and version numbers. | ||
|
||
## Contributing | ||
|
||
Please submit bugs and feature requests through [GitHub Issues](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/issues). Refer to [CONTRIBUTING.md](https://github.com/washingtonstateuniversity/hrswp-employee-recognition/blob/develop/CONTRIBUTING.md) for the development workflow and details for submitting pull requests. |