summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md96
1 files changed, 96 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..dc6eb57
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,96 @@
1## Contributing
2
3First off, thank you for considering contributing to php-malware-finder.
4
5### 1. Where do I go from here?
6
7If you've noticed a bug, an undetected sample or have a question,
8[search the issue tracker](https://github.com/nbs-system/php-malware-finder/issues)
9to see if someone else has already created a ticket. If not, go ahead and
10[make one](https://github.com/nbs-system/php-malware-finder/issues/new)!
11
12### 2. Fork & create a branch
13
14If this is something you think you can fix,
15then [fork php-malware-finder](https://help.github.com/articles/fork-a-repo) and
16create a branch with a descriptive name.
17
18A good branch name would be (where issue #325 is the ticket you're working on):
19
20```sh
21git checkout -b add_new_sample_wp_bruteforcer
22```
23
24### 3. Get the test suite running
25
26Just type `make tests`, the testsuite will be run automatically.
27
28### 6. Make a Pull Request
29
30At this point, you should switch back to your master branch and make sure it's
31up to date with our upstream master branch:
32
33```sh
34git remote add upstream git@github.com:nbs-system/php-malware-finder.git
35git checkout master
36git pull upstream master
37```
38
39Then update your feature branch from your local copy of master, and push it!
40
41```sh
42git checkout add_new_sample_wp_bruteforcer
43git rebase master
44git push --set-upstream origin add_new_sample_wp_bruteforcer
45```
46
47Finally, go to GitHub and [make a Pull Request](https://help.github.com/articles/creating-a-pull-request) :D
48
49Travis CI will [run our test suite](https://travis-ci.org/nbs-system/php-malware-finder).
50We care about quality, so your PR won't be merged until all tests are passing.
51
52### 7. Keeping your Pull Request updated
53
54If a maintainer asks you to "rebase" your PR, they're saying that a lot of code
55has changed, and that you need to update your branch so it's easier to merge.
56
57To learn more about rebasing in Git, there are a lot of [good](http://git-scm.com/book/en/Git-Branching-Rebasing)
58[resources](https://help.github.com/articles/interactive-rebase) but here's the suggested workflow:
59
60```sh
61git checkout add_new_sample_wp_bruteforcer
62git pull --rebase upstream master
63git push --force-with-lease add_new_sample_wp_bruteforcer
64```
65
66### 8. Merging a PR (maintainers only)
67
68A PR can only be merged into master by a maintainer if:
69
701. It is passing CI.
712. It has no requested changes.
723. It is up to date with current master.
73
74Any maintainer is allowed to merge a PR if all of these conditions are met.
75
76### 9. Shipping a release (maintainers only)
77
781. Make sure that all pending and mergeable pull requests are in
792. Make sure that the all the tests are passing, with `make tests`
803. Update the Debian changelog in `./debian/changelog` with `dch -i`
814. Commit the result
825. Create a tag for the release:
83
84 ```sh
85 git checkout master
86 git pull origin master
87 make tests
88 git config user.signingkey 498C46FF087EDC36E7EAF9D445414A82A9B22D78
89 git config user.email security@nbs-system.com
90 git tag -s v$MAJOR.$MINOR.$PATCH -m "v$MAJOR.$MINOR.$PATCH"
91 git push --tags
92 ```
93
946. Build the debian package with `make deb`
957. Create the [release on github](https://github.com/nbs-system/php-malware-finder/releases)
968. Do the *secret release dance*