Skip to content

Latest commit

 

History

History
123 lines (89 loc) · 3.69 KB

CONTRIBUTING.md

File metadata and controls

123 lines (89 loc) · 3.69 KB

This page describes rules to contribute changes and features by Pull Requests creating.

Initialize

To initialize your repo do:

  • Make fork from https://github.com/ostis-ai/scp-machine.
  • Clone your fork to your machine and prepare (see Readme).
git clone [email protected]:yourlogin/scp-machine.git
cd scp-machine
git remote add upstream [email protected]:ostis-ai/scp-machine.git
  • To update your main from upstream use:
git fetch upstream
git checkout upstream/main
  • Use git rebase instead of merge. More documentation about this command just try to apply your commits (from current branch to commits in specified branch). To rebase your branch to main use:
git checkout <yourbranch>
git rebase upstream/main
  • If you have any problems, then redo:
git rebase --abort

Commits message format

Each commit message should be formed as: [tag1]...[tagN] Message text (#issue).

Message text should start from an upper case letter. If commit doesn't fix or implement any #issue, then it shouldn't be pointed in commit message.

Examples:

[cpp] Colored log output
[cpp][test] Add unit test for ScEvent class

Possible tags:

  • [scp] - changes in tests;
  • [kb] - changes in tests;
  • [tests] or [test] - changes in tests;
  • [config] - commits with changes in configuration;
  • [review] - commits with review fixes;
  • [refactor] - commits with some code refactoring;
  • [changelog] - use when you update changelog;
  • [docs] or [doc] - use when you update documentation;
  • [scripts] - updates in the scp-machine/scripts files
  • [ci] - changes in ci configuration or scripts;
  • [git] - changes in git configuration;

Each commit in Pull Request should be an atomic. Another word implement or fix one feature. For example:

Last commit
...
[cpp] Colored log output
[cpp] Add class to work with console
...
Init commit

In this example we add class to work with console (where implemented colored output), then in another commit we had implementation of colored log output.

Each commit should have not much differences excluding cases, with:

  • CodeStyle changes;
  • Renames;
  • Code formatting.

Do atomic commits for each changes. For example if you rename some members in ClassX and ClassY, then do two commits:

[refactor] Rename members in ClassX according to codestyle
[refactor] Rename members in ClassY according to codestyle

Do not mix codestyle changes and any logical fixes in one commit.

All commit, that not applies to this rules, should be split by this rules. Another way they will be rejected with Pull request.

Pull request

Each pull request with many changes, that not possible to review (excluding codestyle, rename changes), will be rejected.

All commit, that not applies to these rules, should be split by these rules. Another way they will be rejected with Pull request.

Pull Request Preparation

  • Read rules to create PR in documentation;
  • Update changelog;
  • Update documentation;
  • Cover new functionality by tests;
  • Your code should be written according to a codestyle like in sc-machine.

Pull Request creation

  • Create PR on GitHub;
  • Check that CI checks were passed successfully;

Pull Request Review

  • Reviewer should test code from PR if CI don't do it;
  • Reviewer submit review as set of conversations;
  • Author make review fixes at Review fixes commits;
  • Author re-request review;
  • Reviewer resolve conversations if they were fixed and approve PR.