Merge branch 'master' into indent_legend_groups

qgis · May 5, 2021 · 9cc4070 · 9cc4070
2 parents 7de030a + c640f46
commit 9cc4070
Show file tree

Hide file tree

Showing 5,442 changed files with 1,116,095 additions and 636,589 deletions.
diff --git a/.ci/config.ctest b/.ci/config.ctest
@@ -0,0 +1,55 @@
+SET (CTEST_SOURCE_DIRECTORY $ENV{CTEST_BUILD_DIR})
+SET (CTEST_BINARY_DIRECTORY $ENV{CTEST_BUILD_DIR}/build)
+#SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
+#SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)
+
+SET (CTEST_CMAKE_COMMAND "cmake")
+SET (CTEST_BUILD_COMMAND $ENV{CTEST_BUILD_COMMAND})
+SET (CTEST_SITE "github.com")
+SET (CTEST_BUILD_NAME "$ENV{CTEST_BUILD_NAME}")
+SET (CTEST_BUILD_CONFIGURATION "Release")
+SET (CTEST_TEST_TIMEOUT 60) # 60 seconds
+IF(DEFINED ENV{CTEST_PARALLEL_LEVEL})
+  SET(PARALLEL_LEVEL $ENV{CTEST_PARALLEL_LEVEL})
+ELSE(DEFINED ENV{CTEST_PARALLEL_LEVEL})
+  SET(PARALLEL_LEVEL 2)
+ENDIF(DEFINED ENV{CTEST_PARALLEL_LEVEL})
+
+SET (INITIAL_CACHE "
+  BUILDNAME:STRING=${CTEST_BUILD_NAME}
+  SITE:STRING=${CTEST_SITE}
+  CTEST_USE_LAUNCHERS:BOOL=ON
+")
+
+SET (CTEST_NOTES_FILES
+  ${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}
+  ${CTEST_BINARY_DIRECTORY}/CMakeCache.txt
+)
+
+IF(NOT WIN32)
+  STRING(ASCII 27 Esc)
+  SET(ColorReset  "${Esc}[m")
+  SET(ColorBold   "${Esc}[1m")
+  SET(Red         "${Esc}[31m")
+  SET(Green       "${Esc}[32m")
+  SET(Yellow      "${Esc}[33m")
+  SET(Blue        "${Esc}[34m")
+  SET(Magenta     "${Esc}[35m")
+  SET(Cyan        "${Esc}[36m")
+  SET(White       "${Esc}[37m")
+  SET(BoldRed     "${Esc}[1;31m")
+  SET(BoldGreen   "${Esc}[1;32m")
+  SET(BoldYellow  "${Esc}[1;33m")
+  SET(BoldBlue    "${Esc}[1;34m")
+  SET(BoldMagenta "${Esc}[1;35m")
+  SET(BoldCyan    "${Esc}[1;36m")
+  SET(BoldWhite   "${Esc}[1;37m")
+ENDIF(NOT WIN32)
+
+# Create link to test results
+# CDash on OTB requires the date to be set for the search to work (used to be UTC-6, seems to be UTC now)
+SET(ENV{TZ} "UTC")
+EXECUTE_PROCESS(COMMAND date +%Y-%m-%d OUTPUT_VARIABLE CDASH_DATE)
+SET(RESULT_LINK "http://cdash.orfeo-toolbox.org/index.php?project=QGIS&filtercount=1&showfilters=1&field1=buildname/string&compare1=63&value1=$ENV{CTEST_BUILD_NAME}&date=${CDASH_DATE}")
+EXECUTE_PROCESS(COMMAND curl --data-urlencode "url=${RESULT_LINK}" -s http://tinyurl.com/api-create.php
+                OUTPUT_VARIABLE SHORTURL)
diff --git a/.ci/config_build.ctest b/.ci/config_build.ctest
@@ -0,0 +1,27 @@
+include(${CMAKE_CURRENT_LIST_DIR}/config.ctest)
+
+# Requires a track on the CDash server
+ctest_start(Experimental)
+
+ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE BUILDRES NUMBER_WARNINGS NUMWARN NUMBER_ERRORS NUMERR)
+
+
+SET(IGNORE_BUILD_FAILURES $ENV{IGNORE_BUILD_FAILURES})
+IF(NOT IGNORE_BUILD_FAILURES)
+  IF(NOT ${BUILDRES} EQUAL 0 OR NOT ${NUMERR} EQUAL 0)
+    ctest_submit (RETRY_COUNT 3 RETRY_DELAY 30)
+    MESSAGE("")
+    MESSAGE("  ${Yellow}Test results submitted to:${ColorReset} ${SHORTURL}")
+    MESSAGE("")
+    MESSAGE( FATAL_ERROR "  ${Red}Build failed. Not running tests.${ColorReset}" )
+    MESSAGE("")
+  ENDIF(NOT ${BUILDRES} EQUAL 0 OR NOT ${NUMERR} EQUAL 0)
+ENDIF(NOT IGNORE_BUILD_FAILURES)
+
+IF(${BUILDRES} EQUAL 0 OR ${NUMERR} EQUAL 0)
+  MESSAGE("")
+  MESSAGE("  ${BoldGreen}Success${ColorReset}")
+  MESSAGE("  ${Green}Build passed successfully.${ColorReset}")
+  MESSAGE("")
+  MESSAGE("")
+ENDIF(${BUILDRES} EQUAL 0 OR ${NUMERR} EQUAL 0)
diff --git a/.ci/config_test.ctest b/.ci/config_test.ctest
@@ -0,0 +1,26 @@
+include(${CMAKE_CURRENT_LIST_DIR}/config.ctest)
+
+# Requires a track on the CDash server
+ctest_start(Experimental)
+
+ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL ${PARALLEL_LEVEL} RETURN_VALUE TESTRES)
+IF(NOT ${TESTRES} EQUAL 0)
+  ctest_submit (RETRY_COUNT 3 RETRY_DELAY 30)
+  MESSAGE("")
+  MESSAGE("  ${Yellow}Test results submitted to:${ColorReset} ${SHORTURL}" )
+  MESSAGE("")
+  SET(LEVEL "")
+  IF(NOT ${TESTRES} EQUAL 0)
+    SET(TESTRES_MESSAGE "  Tests failed.")
+    SET(LEVEL FATAL_ERROR)
+  ENDIF(NOT ${TESTRES} EQUAL 0)
+  MESSAGE( ${LEVEL} "  ${Red}${TESTRES_MESSAGE} ${ColorReset}" )
+ENDIF(NOT ${TESTRES} EQUAL 0)
+
+IF(NOT ${TESTRES} EQUAL 0)
+  MESSAGE("")
+  MESSAGE("  ${BoldGreen}Success${ColorReset}")
+  MESSAGE("  ${Green}All tests passed successfully.${ColorReset}")
+  MESSAGE("")
+  MESSAGE("")
+ENDIF(NOT ${TESTRES} EQUAL 0)
diff --git a/.ci/travis/scripts/ctest2travis.py → .ci/ctest2ci.py b/.ci/travis/scripts/ctest2travis.py → .ci/ctest2ci.py
@@ -3,7 +3,7 @@
 
 """
 ***************************************************************************
-    ctest2travis.py
+    ctest2ci.py
     ---------------------
     Date                 : March 2017
     Copyright            : (C) 2017 by Matthias Kuhn
@@ -27,30 +27,30 @@
 # This script parses output from ctest and injects
 #
 #  - Colors for failing unit tests and test cases
-#
-#  - `travis_fold` control sequences to hide uninteresting output by default
+#  - Group control sequences to hide uninteresting output by default
 
 import sys
 import re
-import shlex
 import subprocess
 from termcolor import colored
+import string
 
 fold_stack = list()
+printable = set(string.printable)
 
 
 def start_fold(tag):
-    sys.stdout.write('travis_fold:start:{}\n'.format(tag))
+    sys.stdout.write('::group::{}\n'.format(tag))
     fold_stack.append(tag)
 
 
 def end_fold():
     try:
         tag = fold_stack.pop()
-        sys.stdout.write('travis_fold:end:{}\n'.format(tag))
+        sys.stdout.write('::endgroup::\n')
     except IndexError:
         updated_line = colored("======================", 'magenta')
-        updated_line += colored("ctest2travis error when processing the following line:", 'magenta')
+        updated_line += colored("ctest2ci error when processing the following line:", 'magenta')
         updated_line += colored("----------------------", 'magenta')
         updated_line += colored(updated_line, 'magenta')
         updated_line += colored("----------------------", 'magenta')
@@ -63,7 +63,7 @@ def end_fold():
 
 def start_test_fold():
     global test_count
-    sys.stdout.write('Running tests')
+    sys.stdout.write('Running tests\n')
     start_fold('test.{}'.format(test_count))
     test_count += 1
 
@@ -75,12 +75,14 @@ def start_test_fold():
 
 for line in p.stdout:
     updated_line = line.decode('utf-8')
+    # remove non printable characters https://stackoverflow.com/a/8689826/1548052
+    filter(lambda x: x in printable, updated_line)
     if re.match('Run dashboard with model Experimental', updated_line):
         start_fold('build')
         updated_line = '{title}\n{line}'.format(title=colored('Running tests...', 'yellow', attrs=['bold']),
                                                 line=updated_line)
 
-    elif re.match('Test project /home/travis/build/qgis/QGIS/build', updated_line):
+    elif re.match('Test project /home/runner/QGIS/QGIS/build', updated_line):
         end_fold()  # tag=build
         start_test_fold()
 
@@ -110,6 +112,8 @@ def start_test_fold():
                 in_failure = True
 
     if not in_failing_test and re.search('[0-9]+% tests passed, [0-9]+ tests failed out of', updated_line):
+        tests_failing = re.match(r'.* ([0-9]+) tests failed', updated_line).group(1)
+        updated_line += '\n::set-output name=TESTS_FAILING::{}'.format(tests_failing)
         end_fold()
 
         if re.search('100% tests passed', updated_line):
@@ -118,6 +122,8 @@ def start_test_fold():
     if re.match('Submit files', updated_line):
         start_fold('submit')
     elif re.search('Test results submitted to', updated_line):
+        cdash_url = re.match(r'.*(http.*)$', updated_line).group(1)
+        updated_line += '\n::set-output name=CDASH_URL::{}'.format(cdash_url)
         end_fold()
 
     sys.stdout.write(updated_line)

diff --git a/.ci/ogc/build.sh b/.ci/ogc/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 mkdir /usr/src/qgis/build
-cd /usr/src/qgis/build || exit -1
+cd /usr/src/qgis/build || exit 1
 
 cmake -GNinja \
  -DWITH_QUICK=OFF \
@@ -18,7 +18,10 @@ cmake -GNinja \
  -DWITH_QWTPOLAR=OFF \
  -DWITH_APIDOC=OFF \
  -DWITH_ASTYLE=OFF \
+ -DWITH_GEOREFERENCER=OFF \
+ -DWITH_ANALYSIS=ON \
  -DWITH_DESKTOP=OFF \
+ -DWITH_GUI=OFF \
  -DWITH_BINDINGS=ON \
  -DWITH_SERVER=ON \
  -DWITH_SERVER_PLUGINS=ON \

diff --git a/.ci/travis/scripts/pr_has_label.py → .ci/pr_has_label.py b/.ci/travis/scripts/pr_has_label.py → .ci/pr_has_label.py
diff --git a/.ci/qt5_14/Dockerfile b/.ci/qt5_14/Dockerfile
diff --git a/.ci/travis/linux/scripts/test_blocklist.txt → .ci/test_blocklist.txt b/.ci/travis/linux/scripts/test_blocklist.txt → .ci/test_blocklist.txt
@@ -11,7 +11,6 @@ qgis_sip_include
 qgis_sip_uptodate
 
 # Need a local postgres installation
-PyQgsAuthManagerPKIPostgresTest
 PyQgsAuthManagerOgrPostgresTest
 PyQgsDbManagerPostgis
 
@@ -24,5 +23,5 @@ qgis_layerdefinition
 # MSSQL requires the MSSQL docker
 PyQgsProviderConnectionMssql
 
-# Broken - segfaults on Travis, likely due to a real issue in the server code
-# PyQgsServerWMSGetPrint
+
+
diff --git a/.ci/travis/linux/scripts/test_flaky.txt → .ci/test_flaky.txt b/.ci/travis/linux/scripts/test_flaky.txt → .ci/test_flaky.txt
@@ -8,5 +8,5 @@ qgis_ziplayertest
 # the docker base image is upgraded
 PyQgsMssqlProvider
 
-# Flaky
-PyQgsPostgresRasterProvider
+# Crashes randomly from time to time on CI in the OCI library
+PyQgsOracleProvider
diff --git a/.ci/travis/code_layout/before_install.sh b/.ci/travis/code_layout/before_install.sh
diff --git a/.ci/travis/code_layout/before_script.sh b/.ci/travis/code_layout/before_script.sh
diff --git a/.ci/travis/code_layout/install.sh b/.ci/travis/code_layout/install.sh
diff --git a/.ci/travis/code_layout/script.sh b/.ci/travis/code_layout/script.sh
diff --git a/.ci/travis/linux/before_install.sh b/.ci/travis/linux/before_install.sh