From 4c4036aea577fedde379fde2f308d1e088f33772 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Fri, 2 Mar 2018 09:42:02 -0400
Subject: [PATCH] allow to save a Docker deps image for PR having [dockerdeps]
 in their title

---
 .ci/travis/linux/before_script.sh | 2 ++
 .travis.yml                       | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.ci/travis/linux/before_script.sh b/.ci/travis/linux/before_script.sh
index 3c3b1abd94e8..26f2be24f764 100755
--- a/.ci/travis/linux/before_script.sh
+++ b/.ci/travis/linux/before_script.sh
@@ -21,6 +21,8 @@ echo "travis_fold:start:travis_env"
 echo "${bold}${endbold}"
 echo "TRAVIS_BRANCH: $TRAVIS_BRANCH"
 echo "TRAVIS_EVENT_TYPE: $TRAVIS_EVENT_TYPE"
+echo "TRAVIS_COMMIT_MESSAGE (from git log): $(git log --format=%B --no-merges -n 1)"
+echo "TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE"
 echo "DOCKER_TAG: $DOCKER_TAG"
 echo "DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH"
 echo "DOCKER_DEPS_IMAGE_REBUILD: $DOCKER_DEPS_IMAGE_REBUILD"
diff --git a/.travis.yml b/.travis.yml
index bb8380168688..b21f2179e184 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ matrix:
       env:
         - TRAVIS_CONFIG=linux
         - DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
-        - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
-        - DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
+        - DOCKER_TAG=$(if [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]]; then if [[ $TRAVIS_EVENT_TYPE =~ push ]]; then echo $TRAVIS_BRANCH | sed 's/master/latest/'; elif [[ $TRAVIS_EVENT_TYPE =~ pull_request ]] && [[ `git log --format=%B --no-merges -n 1` =~ \[dockerdeps\] ]]; then echo "PR-$TRAVIS_PULL_REQUEST"; else echo "latest"; fi; else echo "latest"; fi)
+        - DOCKER_DEPS_PUSH=$(if [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] || [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ pull_request ]] && [[ `git log --format=%B --no-merges -n 1` =~ \[dockerdeps\] ]]; then echo "true"; else echo "false"; fi )
         - DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
         # on cron job, QGIS image is built and push without testing
         - DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "false" )