diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-09-19 10:45:00 +0200 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-09-19 10:56:35 +0200 |
| commit | 63c46467b4d837983a5a6bbfd6a8cd277443d912 (patch) | |
| tree | c9a5e3e89be3a363e60669899fc727548e1c6f31 | |
| parent | 722b2a4ea7ea329fabea4dd92ca1b2c60799f0d7 (diff) | |
| download | PROJ-63c46467b4d837983a5a6bbfd6a8cd277443d912.tar.gz PROJ-63c46467b4d837983a5a6bbfd6a8cd277443d912.zip | |
Build docs from most recent maintenance branch
| -rw-r--r-- | HOWTO-RELEASE | 4 | ||||
| -rwxr-xr-x | travis/after_success.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index 168af418..ddf7e563 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -175,9 +175,10 @@ See step 1.6 above. Do not rename the archives with RC postfixes. 2.2 Update website ------------------------------------------------------------------------------ - - Update the version number in `doc/source/conf.py` - Add the release notes from `NEWS` to `docs/source/news.rst` - Update download links in `docs/source/download.rst` + - Update `$TRAVIS_BRANCH` in `travis\after_success.sh` to new maintenance + branch. *Commit the changes to master and cherry-pick into maintenance branch.* @@ -231,6 +232,7 @@ version numbers in the files. - src/proj_api.h: Update PJ_VERSION. - src/pj_release.c: Update date to the scheduled release date. - CMakelists.txt: Update proj_version() + - doc/source/conf.py: Update version number *Commit changes to master branch.* diff --git a/travis/after_success.sh b/travis/after_success.sh index 1b442ddb..8a230693 100755 --- a/travis/after_success.sh +++ b/travis/after_success.sh @@ -6,7 +6,8 @@ set -e coveralls --extension .c --exclude build_autoconf --exclude build_cmake echo "$TRAVIS_SECURE_ENV_VARS" ./travis/build_docs.sh -if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then +# Only build and publish docs when changes are made on most recent maintenance branch +if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "5.2"; then echo "publish website"; ./travis/add_deploy_key.sh; ./travis/deploy_website.sh $TRAVIS_BUILD_DIR/docs/build /tmp; |