Update AZP CI setup (#2146)

Author: dg0yt

ci/azure-pipelines.yml

@@ -33,7 +33,7 @@ variables:
 jobs:
 - job: Codespell
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   steps:
     - checkout: self
       fetchDepth: 1
@@ -43,7 +43,7 @@ jobs:
 - job: Release_Notes
   displayName: Release Notes
   pool:
-    vmImage: 'ubuntu-18.04'
+    vmImage: 'ubuntu-20.04'
   steps:
     - checkout: self
       fetchDepth: 1
@@ -54,8 +54,8 @@ jobs:
   displayName: macOS (Release)
   dependsOn: Release_Notes
   variables:
-    IMAGE_NAME: 'macos-10.15'
-    SUPBERBUILD_IMAGE_NAME: 'macos-10.14'
+    IMAGE_NAME: 'macos-11'
+    SUPBERBUILD_IMAGE_NAME: 'macos-11'
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     QT_STYLE_OVERRIDE: fusion
   pool:
@@ -99,7 +99,7 @@ jobs:
   dependsOn: Codespell
   condition: succeededOrFailed()
   variables:
-    IMAGE_NAME: 'ubuntu-18.04'
+    IMAGE_NAME: 'ubuntu-20.04'
     SUPBERBUILD_IMAGE_NAME: $(IMAGE_NAME)
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     ENABLE_PDF_MANUAL: 1
@@ -114,7 +114,7 @@ jobs:
         cmakeArgs: >
           -G Ninja
           -DCMAKE_BUILD_TYPE=RelWithDebInfo
-          -DMapper_CI_ENABLE_CODECHECKS=1
+          -DMapper_CI_ENABLE_CODECHECKS=0
     - template: publish.yml
     - bash: |
         cd ${BUILD_SOURCESDIRECTORY}/build/source/openorienteering-mapper-ci
@@ -127,7 +127,7 @@ jobs:
   dependsOn: macOS
   condition: succeededOrFailed()
   variables:
-    IMAGE_NAME: 'ubuntu-18.04'
+    IMAGE_NAME: 'ubuntu-20.04'
     SUPBERBUILD_IMAGE_NAME: $(IMAGE_NAME)
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     CC: gcc
@@ -155,8 +155,8 @@ jobs:
   displayName: Android arm-v7 (Release)
   dependsOn: Release_Notes
   variables:
-    IMAGE_NAME: 'macos-10.15'
-    SUPBERBUILD_IMAGE_NAME: 'macos-10.14'
+    IMAGE_NAME: 'macos-11'
+    SUPBERBUILD_IMAGE_NAME: 'macos-11'
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     TARGET: armv7a-linux-androideabi
     TARGET_SUFFIX: -$(TARGET)
@@ -178,6 +178,7 @@ jobs:
           -DMapper_CI_GDAL_DATA_DIR=$(SUPERBUILD_INSTALL_DIR)/$(TARGET)/usr/share/gdal
           -DANDROID_SDK_INSTALL_ROOT=$(HOME)
           -DANDROID_NDK_INSTALL_ROOT=$(HOME)
+          -DANDROID_NDK_ROOT=FALSE
           -DANDROID_BUILD_LIBCXX=1
         buildArgs: -j5
         toolchainTargets:
@@ -191,8 +192,8 @@ jobs:
   displayName: Android arm64 (Release)
   dependsOn: Android_armv7
   variables:
-    IMAGE_NAME: 'macos-10.15'
-    SUPBERBUILD_IMAGE_NAME: 'macos-10.14'
+    IMAGE_NAME: 'macos-11'
+    SUPBERBUILD_IMAGE_NAME: 'macos-11'
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     TARGET: aarch64-linux-android
     TARGET_SUFFIX: -$(TARGET)
@@ -214,6 +215,7 @@ jobs:
           -DMapper_CI_GDAL_DATA_DIR=$(SUPERBUILD_INSTALL_DIR)/$(TARGET)/usr/share/gdal
           -DANDROID_SDK_INSTALL_ROOT=$(HOME)
           -DANDROID_NDK_INSTALL_ROOT=$(HOME)
+          -DANDROID_NDK_ROOT=FALSE
           -DANDROID_BUILD_LIBCXX=1
         buildArgs: -j5
         toolchainTargets:
@@ -227,8 +229,8 @@ jobs:
   displayName: Android x86 (Release)
   dependsOn: Android_x86_64
   variables:
-    IMAGE_NAME: 'macos-10.15'
-    SUPBERBUILD_IMAGE_NAME: 'macos-10.14'
+    IMAGE_NAME: 'macos-11'
+    SUPBERBUILD_IMAGE_NAME: 'macos-11'
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     TARGET: i686-linux-android
     TARGET_SUFFIX: -$(TARGET)
@@ -250,6 +252,7 @@ jobs:
           -DMapper_CI_GDAL_DATA_DIR=$(SUPERBUILD_INSTALL_DIR)/$(TARGET)/usr/share/gdal
           -DANDROID_SDK_INSTALL_ROOT=$(HOME)
           -DANDROID_NDK_INSTALL_ROOT=$(HOME)
+          -DANDROID_NDK_ROOT=FALSE
           -DANDROID_BUILD_LIBCXX=1
         buildArgs: -j5
         toolchainTargets:
@@ -263,8 +266,8 @@ jobs:
   displayName: Android x86_64 (Release)
   dependsOn: Release_Notes
   variables:
-    IMAGE_NAME: 'macos-10.15'
-    SUPBERBUILD_IMAGE_NAME: 'macos-10.14'
+    IMAGE_NAME: 'macos-11'
+    SUPBERBUILD_IMAGE_NAME: 'macos-11'
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     TARGET: x86_64-linux-android
     TARGET_SUFFIX: -$(TARGET)
@@ -286,6 +289,7 @@ jobs:
           -DMapper_CI_GDAL_DATA_DIR=$(SUPERBUILD_INSTALL_DIR)/$(TARGET)/usr/share/gdal
           -DANDROID_SDK_INSTALL_ROOT=$(HOME)
           -DANDROID_NDK_INSTALL_ROOT=$(HOME)
+          -DANDROID_NDK_ROOT=FALSE
           -DANDROID_BUILD_LIBCXX=1
         buildArgs: -j5
         toolchainTargets:
@@ -301,7 +305,7 @@ jobs:
   #condition: succeededOrFailed()
   condition: False
   variables:
-    IMAGE_NAME: 'ubuntu-18.04'
+    IMAGE_NAME: 'ubuntu-20.04'
     SUPBERBUILD_IMAGE_NAME: $(IMAGE_NAME)
     SUPERBUILD_INSTALL_DIR:  $(HOME)/superbuild
     TARGET: x86_64-w64-mingw32

ci/setup-common.yml

@@ -51,8 +51,9 @@ steps:
     if [ -z "${APP_ID_SUFFIX}" -a -n "${VERSION_DISPLAY}" ] ; then
       echo "##vso[task.setVariable variable=APP_ID_SUFFIX].${BUILD_SOURCEBRANCHNAME}"
     fi
-    # Fix Superbuild sdk_host quirk
-    echo "##vso[task.setVariable variable=ANDROID_NDK_ROOT]"
+    echo "##vso[task.setVariable variable=ANDROID_NDK]$(HOME)/android-ndk-r19c"
+    echo "##vso[task.setVariable variable=ANDROID_NDK_HOME]$(HOME)/android-ndk-r19c"
+    echo "##vso[task.setVariable variable=ANDROID_NDK_ROOT]$(HOME)/android-ndk-r19c"
     env | sort
   displayName: 'Update environment'
 

ci/setup-macos.yml

@@ -32,8 +32,10 @@ steps:
 - bash: |
     set -x
     set -e
-    sudo xcode-select -s /Applications/Xcode_10.3.app/Contents/Developer
+    sudo xcode-select -s /Applications/Xcode_11.7.app/Contents/Developer
     xcode-select --print-path
     pip install lxml
+    $(ANDROID_HOME)/tools/bin/sdkmanager --uninstall "platforms;android-33-ext5"
+    $(ANDROID_HOME)/tools/bin/sdkmanager --uninstall "platforms;android-33-ext4"
   displayName: 'Prepare macOS build tools'
 

ci/setup-ubuntu.yml

@@ -34,31 +34,22 @@ steps:
     set -e
     
     sudo apt-get update
-    sudo apt-get install doxygen graphviz libgl-dev ninja-build python-lxml
+    sudo apt-get install doxygen graphviz libegl-dev libgl-dev ninja-build python-lxml
     
     if [ "${TARGET}" = "x86_64-w64-mingw32" ] ; then
       sudo apt-get install g++-mingw-w64-x86-64
     fi
     
-    if [ -n "${CLAZY_VERSION}" ] ; then
-      # apt-cache policy clang-tidy-8
-      sudo apt-get remove -y libllvm8   # possibly incompatible
-      sudo apt-get install clang-tidy-8 # for extra checks
-      CLAZY_IMAGE=Clazy-x86_64-${CLAZY_VERSION}.AppImage
-      curl https://downloads.kdab.com/clazy/${CLAZY_VERSION}/${CLAZY_IMAGE} -O
-      curl https://downloads.kdab.com/clazy/${CLAZY_VERSION}/sums.txt -O
-      grep --no-filename $(sha1sum ${CLAZY_IMAGE}) sums.txt
-      chmod +x ${CLAZY_IMAGE}
-      # Extract the app-image, or paths change on every invocation
-      ./${CLAZY_IMAGE} --appimage-extract
+    if [ -n "${ENABLE_CLAZY}" ] ; then
+      sudo apt-get install clazy
       set +x # https://github.com/microsoft/azure-pipelines-tasks/issues/10331
-      echo "##vso[task.setVariable variable=CXX]${PWD}/squashfs-root/AppRun"
+      echo "##vso[task.setVariable variable=CXX]clazy"
       set -x
     fi
     
     case "${CXXFLAGS}" in
       *coverage*)
-        sudo apt-get install g++ libgcc-5-dev libxml2-utils python-pip
+        sudo apt-get install g++ libxml2-utils python3-pip
         sudo pip install gcovr
         sed -i -e "/autosave_t/s,MANUAL,," test/CMakeLists.txt
         wget "https://raw.githubusercontent.com/international-orienteering-federation/datastandard-v3/master/IOF.xsd"

codespell-ignore.txt

@@ -5,3 +5,6 @@
 				outerPolyNodeToPathObjects(*node.Childs[i]->Childs[j], out_objects, proto, polymap);
             <symbol type="1" id="72" code="3.11" name="|D| Water tank, Water trough">
 | VDV | [VDV-451/VDV-452/INTREST Data Format](https://gdal.org/drv_vdv.html) | txt x10 |
+# doc/man/Mapper.1
+\h'-04'\(bu\h'+03'\c
+.IP \(bu 2.3

codespell.sh

@@ -29,6 +29,7 @@ codespell -q 7 \
   'translations/future_translations.cpp' \
   -S "$SKIP_LIST" \
   -x codespell-ignore.txt \
+  -L clen \
   "$@"
 
 git log -n 20 | codespell -q 7 - | sed 's/^/git log: /'