meta data for this page
  •  

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
contribute [2024/12/30 12:23] – Change to using develop > master branches; restructure wrongechocontribute [2025/01/09 16:50] (current) – mention $repo_branch in config.php wrongecho
Line 9: Line 9:
 //For large changes/new features, please ensure to discuss the issue/idea with other contributors on the Forum first. This saves everyone time.// //For large changes/new features, please ensure to discuss the issue/idea with other contributors on the Forum first. This saves everyone time.//
  
-**Steps**+**Steps to raise a PR**
   - Fork the Project on GitHub   - Fork the Project on GitHub
-  - Clone the development branch: (''git clone --branch develop https://github.com/itflow-org/itflow.git'')+  - Clone the development branch: (''git clone //-//-branch develop https://github.com/itflow-org/itflow.git'')
   - Create your Feature Branch (''git checkout -b my-feature'')   - Create your Feature Branch (''git checkout -b my-feature'')
   - Commit your Changes (''git add something.txt && git commit -m 'Add some''')   - Commit your Changes (''git add something.txt && git commit -m 'Add some''')
Line 17: Line 17:
   - Open a Pull Request, adusting the base from master to develop   - Open a Pull Request, adusting the base from master to develop
   - {{:pr_-_select-mh.png?direct&550|}}   - {{:pr_-_select-mh.png?direct&550|}}
- 
  
 **General Guidance** **General Guidance**
 +  * Don't forget to set your $repo_branch in config.php to 'develop'
   * Review the [[code_standards|code standards]] and the [[https://github.com/itflow-org/itflow/blob/master/CODE_OF_CONDUCT.md|code of conduct]]   * Review the [[code_standards|code standards]] and the [[https://github.com/itflow-org/itflow/blob/master/CODE_OF_CONDUCT.md|code of conduct]]
   * Discuss changes with the community first   * Discuss changes with the community first
Line 37: Line 37:
   * Report bugs and raise feature requests   * Report bugs and raise feature requests
   * Tell others in the industry of your success using ITFlow to manage your clients //(but please don't spam)//   * Tell others in the industry of your success using ITFlow to manage your clients //(but please don't spam)//
 +
 +======Maintainer Steps for monthly releases======
 +
 +Once a month, we will merge develop into master:
 +
 +  - Ensure testing has been completed as much as possible
 +  - In develop, increment version.php in the YY.M.V format (e.g. 25.1 for the first release in Jan 2025, 25.1.1 for the second release of Jan 2025, and 25.6 for the first release in June 2025)
 +  - Look over the recent changes and write a short release summary
 +  - Raise a PR to merge develop into master
 +  - Test a final time on PR Review & ensure no other issues (Sonar, Linting, etc)
 +  - Approve the PR & Merge