From 2130f4f47cec8d6655071794c3ad3a19e27b7a16 Mon Sep 17 00:00:00 2001
From: Etienne Trimaille <gustrimaille@yahoo.fr>
Date: Fri, 28 Aug 2020 17:43:56 +0200
Subject: [PATCH] Travis - Review the configuration

---
 .travis.yml  | 17 +++++++----------
 CHANGELOG.md |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 89a14f1..fe06ac4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
+os: linux
 dist: bionic
-
 language: python
-
 python: 3.7
 
 services:
@@ -10,7 +9,7 @@ services:
 branches:
   only:
     - master
-    - "/^v.*$/"
+    - /^v?\d+(\.\d+)*$/
 
 env:
   matrix:
@@ -18,10 +17,7 @@ env:
     - QGIS_VERSION=3.10
     - QGIS_VERSION=3.14
 
-before_install:
-  - docker pull 3liz/qgis-platform:${QGIS_VERSION}
 install:
-  - cd ${TRAVIS_BUILD_DIR}
   - mkdir .local
   - mkdir .cache
 script:
@@ -43,12 +39,13 @@ jobs:
     - stage: Deploy
       if: tag IS present
       env: # no environment variables - overwrite with empty to remove matrix
-      condition: "$TRAVIS_TAG =~ ^v[0-9]+\\.[0-9]+\\.[0-9]+"
       name: Create release, plugins.qgis.org
       install:
-        - pip3 install qgis-plugin-ci==1.8.2
+        - pip3 install qgis-plugin-ci==1.8.3
       before_deploy:
         - export RELEASE_TITLE=${TRAVIS_TAG:1}
+        - qgis-plugin-ci changelog $TRAVIS_TAG > ../release.md
+        - cat ../release.md
       script:
         - qgis-plugin-ci -v
 
@@ -57,7 +54,8 @@ jobs:
           edge: true
           file: .
           name: ${RELEASE_TITLE}
-          api_key: ${GH_TOKEN}
+          release_notes_file: ../release.md
+          token: ${GH_TOKEN}
           on:
             tags: true
 
@@ -68,6 +66,5 @@ jobs:
             --github-token ${GH_TOKEN}
             --osgeo-username ${OSGEO_USERNAME}
             --osgeo-password ${OSGEO_PASSWORD}
-            --create-plugin-repo
           on:
             tags: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4efac94..43e22a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-### 3.1.0 - 28/04/2020
+### v3.1.0 - 28/04/2020
 
 * Add warning on QGIS Desktop
 * Add additional params in the URL, contribution from ThomasG77