THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
Page History
...
Mastershould become the development branch for the next release (current sprint).- Whenever current release (sprint) goes to QA, new branch should be created from
master. This waymastercan be used to develop functionality of the next release. All release fixes get merged to release branch and then tomaster. - All individual ticket/features development happen in separate repositories (either local or forks of GitHub mirror - https://github.com/apache/ignite) . Firm rule: ticket/feature branches should never be pushed to repo.
- Development branches should be created off of the
masterbranch (or release branch if one exists - in this case changes get merged to release branch and then tomasterbranch). Changes get merged tomasterbranch of the project Git via patch validation process described here - How to Contributeat Contribution ways. - Git tag should be created for every release.
- All CI tests must pass before the merge of ticket branches to the
master(or release) branch.
...
- GitHub pull-request
- Patch-file
1. GitHub pull-request
+------------+ +---------------+ +-----------------+
...
+-----------------+
For contributors
To start:
- You need to fork an Apache Ignite mirror on GitHub.
- Make a local copy of your Apache Ignite mirror fork. Your remote origin will refer to 'https://github.com/<your_github_uname>/incubator-ignite.git'.
You will need to update a local master sometimes (to merge to your development branches sometimes). How to do it:
Add remote for Apache Ignite mirror (you need to do it once)
git remote add upstream https://github.com/apache/ignite.git
Each time when you want to update your local master do next:
git checkout master
git pull upstream
...
- Fix / implement JIRA ticket in your fork. Commit branch to origin (origin = your fork). It's recommended to develop IGNITE-xxx ticket at ignite-xxx branch.
- Create pull request from the new remote branch in the fork to master of Apache Ignite mirror. Please, start a title of the pull request from 'IGNITE-xxx'. An email about the pull request will be send to dev-list and the same JIRA comment will be added to the IGNITE-xxx ticket.
- TeamCity will automatically trigger builds and label it as a "pull/<pull-request-number>/head". Select this label in the branches dropdown and monitor test results.
- Once tests are passed, the pull request can be reviewed and merged by a committer.
For committers
In additional to contributors configuration, commiters need to have one more remote - for working with Apache Git repo. It can be added like this:
...
- Checks that you don't have any uncommitted changes.
- Checks you are one master branch and master branch is up-to-date.
- Updates local master from Apache git repo.
- Fetches pull request to a local branch:
git fetch upstream pull/<id>/head:pull-<id>-head- Saves an author and a comment of the last commit at pull-<id>-head.
- Merges from the new branch to master:
git merge --squash pull-<id>-head
- Ask you about custom comment or using the saved comment.
- Commit to local master. The script automatically sign-off a commit and add "Fixes #<id>." suffix to comment (It will close the pull request, see https://help.github.com/articles/closing-issues-via-commit-messages/):
git commit --author=“<saved_author>" -s -m “<comment> - Fixes #<id>.”
Now, you will have one commit at master with all changes from pull-request. Changes can be reviewed again. If you accept all changes and want to push it, do next:
git push apache master
2. Patch-file
2.1 Where to start
You can start by cloning the Ignite GIT repo.
| Info | ||
|---|---|---|
| ||
git clone https://git-wip-us.apache.org/repos/asf/incubator-ignite |
2.2 How to generate patches
We use git as our version control system. To streamline the process of giving proper credit to the contributors when committing patches, we encourage contributors to submit patches generated using "git format-patch" command. This has many benefits:
...
| Info | ||||
|---|---|---|---|---|
| ||||
Note: All TC test builds can be triggered manually via "Ignite/ -> Run All for patch" (by 'Jira number'). A comment will be added to the jira with all new triggered builds. |
2.3 For commiters
Contributor patches have to be applied by next command.
...
Overview
Content Tools
Apps