fix Travis build trigger

qgis · Mar 5, 2019 · ae67042 · ae67042
1 parent 0a75009
commit ae67042
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -38,18 +38,21 @@ if [[ ${DOCKER_BUILD_QGIS_IMAGE} =~ true ]]; then
   docker cp ${container_id}:/usr/src/QGIS/.ccache_image_build ${CCACHE_DIR_IMAGE_BUILD}
   popd
   echo "Trigger build of PyQGIS Documentation"
-  body="{
+  body='{
-    'request': {
+    "request": {
-      'branch':'master',
+      "branch":"master",
-      'message': 'Trigger PyQGIS doc build after release of new Docker image as ${DOCKER_TAG}',
+      "message": "Trigger PyQGIS doc build after release of new Docker image as __DOCKER_TAG__",
-      'config': {
+      "config": {
-        'merge_mode': 'deep_merge',
+        "merge_mode": "deep_merge",
-        'env': {
+        "matrix": {
-          'global': ['QGIS_VERSION_BRANCH=${TRAVIS_BRANCH}']
+          "include": {
+            "env": ["QGIS_VERSION_BRANCH=__QGIS_VERSION_BRANCH__"]
+          }
         }
       }
     }
-  }"
+  }'
+  body=$(sed "s/__QGIS_VERSION_BRANCH__/${TRAVIS_BRANCH}/; s/__DOCKER_TAG__/${DOCKER_TAG}/" <<< $body)
   curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" \
     -H "Travis-API-Version: 3" -H "Authorization: token $TRAVIS_TOKEN" -d "$body" \
     https://api.travis-ci.org/repo/qgis%2Fpyqgis/requests