summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING18
1 files changed, 13 insertions, 5 deletions
diff --git a/CONTRIBUTING b/CONTRIBUTING
index b2e3cc00..fa86767f 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -45,10 +45,14 @@ How to add new code and to update existing code
https://github.com/the-tcpdump-group/tcpdump
(See https://help.github.com/articles/fork-a-repo/)
-2) Setup an optional Travis-CI build
- You can setup a travis build for your fork. So, you can test your changes
- on Linux and OSX before sending pull requests.
- (See http://docs.travis-ci.com/user/getting-started/)
+2) Setup optional Travis CI build and AppVeyor builds
+ You can setup Travis CI and AppVeyor builds for your fork, soyou can
+ test your changes on Linux, macOS, and Windows before sending pull
+ requests.
+ (See http://docs.travis-ci.com/user/getting-started/ for information
+ on setting up Travis CI; go to https://ci.appveyor.com/login and log
+ in with your GitHub account and select "NEW PROJECT" to set up an
+ AppVeyor build.)
3) Setup your git working copy
git clone https://github.com/<username>/tcpdump.git
@@ -98,9 +102,13 @@ How to add new code and to update existing code
9) Once 100% happy, put your work into your forked repository.
git push
+ This will trigger both Travis CI and AppVeyor builds.
10) Initiate and send a pull request
- (See https://help.github.com/articles/using-pull-requests/)
+ (See https://help.github.com/articles/using-pull-requests/)
+ Note that creating the pull request will cause your code to be
+ tested on Linux and macOS with Travis CI and on Windows with
+ AppVeyor.
Code style and generic remarks