File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -21,6 +21,8 @@ echo "travis_fold:start:travis_env"
21
21
echo " ${bold}${endbold} "
22
22
echo " TRAVIS_BRANCH: $TRAVIS_BRANCH "
23
23
echo " TRAVIS_EVENT_TYPE: $TRAVIS_EVENT_TYPE "
24
+ echo " TRAVIS_COMMIT_MESSAGE (from git log): $( git log --format=%B --no-merges -n 1) "
25
+ echo " TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE "
24
26
echo " DOCKER_TAG: $DOCKER_TAG "
25
27
echo " DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH "
26
28
echo " DOCKER_DEPS_IMAGE_REBUILD: $DOCKER_DEPS_IMAGE_REBUILD "
Original file line number Diff line number Diff line change 8
8
env :
9
9
- TRAVIS_CONFIG=linux
10
10
- DOCKER_COMPOSE=${TRAVIS_BUILD_DIR}/.docker/docker-compose.travis.yml
11
- - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
12
- - DOCKER_DEPS_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ push ]] && echo "true" || echo "false" )
11
+ - 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 )
12
+ - 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 )
13
13
- DOCKER_DEPS_IMAGE_REBUILD=$( [[ $TRAVIS_COMMIT_MESSAGE =~ '[docker] update dependencies' ]] && echo "true" || echo "false" )
14
14
# on cron job, QGIS image is built and push without testing
15
15
- DOCKER_QGIS_IMAGE_BUILD_PUSH=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && [[ $TRAVIS_EVENT_TYPE =~ cron ]] && echo "true" || echo "false" )
You can’t perform that action at this time.
0 commit comments