From: Joe Orton <jorton@apache.org>
Date: Thu, 21 Nov 2019 13:00:47 +0000 (+0000)
Subject: Doc updates for Travis.  [skip ci]
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1777
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff510e162b9b2849bcc51b6377ac41c27d9e9409;p=thirdparty%2Fapache%2Fhttpd.git

Doc updates for Travis.  [skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1870086 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/README.travis b/test/README.travis
index 0c97d9918a6..9e39e73917a 100644
--- a/test/README.travis
+++ b/test/README.travis
@@ -4,14 +4,16 @@ Variables
 
 The Travis scripts use the following environment variables:
 
-* APR_VERSION - if set, APR of this version is built and installed
-  in $HOME/root/apr-$APR_VERSION (trunk means trunk is used)
+* APR_VERSION - if set, APR of this version is built and installed in
+  $HOME/root/apr-$APR_VERSION - a value of "trunk" means trunk is
+  used, "*.x" means a branch, otherwise a tagged version is implied.
 
 * APR_CONFIG - arguments to pass when running APR's configure script
   if APR_VERSION is set
 
 * APU_VERSION - if set, APR-util of this version is built and
-  installed in $HOME/root/apu-$APU_VERSION
+  installed in $HOME/root/apr-util-$APU_VERSION - a value of "*.x"
+  means a branch, otherwise a tagged version is implied.
 
 * APU_CONFIG - arguments to pass when running APR-util's configure
   script if APU_VERSION is set
@@ -49,3 +51,52 @@ TODO list
 * VPATH builds
 * sanity checks for use of APLOGNO() - empty arguments, accidental duplicates, etc.
  - not sure how exactly
+
+Testing from a Feature Branch
+-----------------------------
+
+An SVN branch off trunk should be mirrored to github, and will be
+tested in the same way that trunk is in Travis, so this workflow is
+available for those familiar with using Subversion and the standard
+ASF/httpd repository layout.
+
+Tested branches are listed at: https://travis-ci.org/apache/httpd/branches
+
+Travis will also run the tests for a PR filed against the httpd Github
+repository at https://github.com/apache/httpd or from a fork of this
+repository if enabled for the Travis user.
+
+A workflow to enable testing would be as follows, substituting
+$USERNAME for your github username:
+
+  $ git clone https://github.com/apache/httpd
+  $ cd httpd
+  $ git remote add $USERNAME git@github.com:$USERNAME/httpd.git
+  $ git checkout -b my-feature origin/trunk
+  ... do some work ...
+  $ git commit ...
+  $ git push -u $USERNAME my-feature:my-feature
+
+To enable testing for a fork, visit the settings page at
+https://travis-ci.org/$USERNAME/httpd/settings - you may need to sync
+your account via https://travis-ci.org/account/repositories for a
+freshly created fork.
+
+To create a Pull Request, go to a URL like:
+https://github.com/apache/httpd/compare/trunk...$USERNAME:trunk
+
+Once a PR has been created, travis will run the tests and link the
+results from a PR comment. All tested PRs are listed here:
+https://travis-ci.org/apache/httpd/pull_requests
+
+To merge from github back to SVN trunk, create a patch from e.g.:
+
+  $ git diff origin/trunk..my-feature
+
+and then apply it in SVN.  To rebase a feature once trunk has
+diverged, from a feature branch run:
+
+  $ git pull
+  $ git rebase -i origin/trunk
+
+and follow the standard rebase steps.