Cmake build: merge upstream/main

.dockerignore

@@ -1,5 +1,6 @@
 docker
 !docker/testdata
+!docker/alpine/grass_tests.sh
 .gitignore
 .github
 .travis

.flake8

@@ -1,7 +1,9 @@
 [flake8]
 ignore =
-    E203,  # whitespace before ':' (Black)
-    W503,  # line break before binary operator (Black)
+    # whitespace before ':' (Black)
+    E203,
+    # line break before binary operator (Black)
+    W503,
 
 per-file-ignores =
     # Files and directories which need fixes or specific exceptions
@@ -54,6 +56,7 @@ per-file-ignores =
     gui/wxpython/core/render.py: E722, F841, E501
     gui/wxpython/core/ws.py: F841, E501
     gui/wxpython/core/settings.py: E722
+    gui/wxpython/core/watchdog.py: E402
     gui/wxpython/datacatalog/tree.py: E731, E402, E501
     gui/wxpython/dbmgr/base.py: E501, E722, F841
     gui/wxpython/dbmgr/dialogs.py: E501, F841, E722
@@ -200,7 +203,7 @@ per-file-ignores =
     scripts/v.report/v.report.py: F841, E501
     scripts/db.out.ogr/db.out.ogr.py: F841
     scripts/g.extension/g.extension.py: F841, E722, E501
-    scripts/r.unpack/r.unpack.py: E722, E501
+    scripts/r.unpack/r.unpack.py: E501
     scripts/v.unpack/v.unpack.py: F841, E722, E501
     scripts/v.import/v.import.py: F841, E722, E501
     scripts/db.univar/db.univar.py: E741, E501
@@ -211,7 +214,7 @@ per-file-ignores =
     scripts/r.fillnulls/r.fillnulls.py: E722, E501
     scripts/d.rast.edit/d.rast.edit.py: E722, E501
     scripts/v.what.strds/v.what.strds.py: E722, E501
-    scripts/i.in.spotvgt/i.in.spotvgt.py: E722, E501
+    scripts/i.in.spotvgt/i.in.spotvgt.py: E501
     # Line too long (esp. module interface definitions)
     scripts/*/*.py: E501
     # local variable 'column' is assigned to but never used

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 ---
-open_collective: grass
+open_collective: grass/contribute

.github/workflows/additional_checks.yml

@@ -16,6 +16,10 @@ on:
       - main
       - releasebranch_*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   additional-checks:
     name: Additional checks
@@ -38,6 +42,10 @@ jobs:
         with:
           python-version: '3.10'
 
+      - name: Check that files with the same content are the same
+        run: |
+          diff Dockerfile docker/ubuntu/Dockerfile
+
       - name: Generate core modules with last commit JSON file and test it
         run: |
           python -m pip install pytest pytest-depends

.github/workflows/build_centos.sh

@@ -41,7 +41,8 @@ export CXXFLAGS="-std=gnu++11"
     --without-mysql \
     --without-postgres \
     --without-odbc \
-    --without-fftw
+    --without-fftw \
+    --without-pdal
 
 make
 make install

.github/workflows/centos.yml

@@ -11,6 +11,10 @@ on:
       - main
       - releasebranch_*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: ${{ matrix.os }} build

.github/workflows/clang-format-check.yml

@@ -9,14 +9,17 @@ on:
     branches:
       - main
       - releasebranch_*
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
 jobs:
   formatting-check:
     name: Formatting Check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Run clang-format style check for C/C++/Protobuf programs.
-        uses: jidicula/clang-format-action@v4.10.2
+        uses: jidicula/clang-format-action@v4.11.0
         with:
           clang-format-version: '15'
           check-path: .

.github/workflows/cmake.yml

@@ -0,0 +1,91 @@
+# inspired by "build GDAL library and to run test with CMake"
+# from https://github.com/OSGeo/gdal/blob/master/.github/workflows/cmake_builds.yml
+
+name: Build and test with CMake
+
+on:
+    push:
+        paths-ignore:
+            - 'doc/**'
+        branches-ignore:
+            - 'backport**'
+    pull_request:
+        paths-ignore:
+            - 'doc/**'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+env:
+  CMAKE_UNITY_BUILD: OFF
+
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
+jobs:
+
+  build-linux-ubuntu-20.04:
+    runs-on: ubuntu-20.04
+    env:
+      CMAKE_OPTIONS: -DPython_LOOKUP_VERSION=3.8 -DUSE_CCACHE=ON
+      cache-name: cmake-ubuntu-20.04
+    steps:
+    - name: Checkout GRASS
+      uses: actions/checkout@v3
+    - name: Setup cache
+      uses: actions/cache@v3
+      id: cache
+      with:
+          path: ${{ github.workspace }}/.ccache
+          key: ${{ runner.os }}-${{ env.cache-name }}-${{ github.base_ref }}${{ github.ref_name }}-${{ github.run_id }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-name }}-${{ github.base_ref }}
+            ${{ runner.os }}-${{ env.cache-name }}
+    - name: Install CMake 3.11.4
+      run: |
+        cd ${GITHUB_WORKSPACE}
+        wget https://github.com/Kitware/CMake/releases/download/v3.11.4/cmake-3.11.4-Linux-x86_64.tar.gz
+        tar xzf cmake-3.11.4-Linux-x86_64.tar.gz
+        echo "CMAKE_DIR=$GITHUB_WORKSPACE/cmake-3.11.4-Linux-x86_64/bin" >> $GITHUB_ENV
+        echo "$GITHUB_WORKSPACE/cmake-3.11.4-Linux-x86_64/bin" >> $GITHUB_PATH
+    - run: |
+        cmake --version
+    - name: Install dependencies
+      run: |
+        sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
+        sudo apt-get update
+        sudo apt-get install -y -q build-essential \
+         flex make bison gcc libgcc1 g++ ccache \
+         python3 python3-dev \
+         python3-opengl python3-wxgtk4.0 \
+         python3-dateutil libgsl-dev python3-numpy \
+         wx3.0-headers wx-common libwxgtk3.0-gtk3-dev \
+         libwxbase3.0-dev libbz2-dev zlib1g-dev gettext \
+         libtiff5-dev libpnglite-dev libcairo2 libcairo2-dev \
+         sqlite3 libsqlite3-dev \
+         libpq-dev libreadline6-dev libfreetype6-dev \
+         libfftw3-3 libfftw3-dev \
+         libboost-thread-dev libboost-program-options-dev libpdal-dev\
+         subversion libzstd-dev checkinstall \
+         libglu1-mesa-dev libxmu-dev \
+         ghostscript wget -y make ccache g++ 
+        sudo apt-get update -y
+    - name: Configure ccache
+      run: |
+          echo CCACHE_BASEDIR=$PWD >> ${GITHUB_ENV}
+          echo CCACHE_DIR=$PWD/.ccache >> ${GITHUB_ENV}
+          echo CCACHE_MAXSIZE=250M >> ${GITHUB_ENV}
+          ccache -z
+      working-directory: ${{ github.workspace }}
+    - name: Configure
+      run: |
+        mkdir build
+        cmake ${CMAKE_OPTIONS} -S $GITHUB_WORKSPACE -B $GITHUB_WORKSPACE/build
+    - name: Build
+      run: |
+        cd $GITHUB_WORKSPACE/build
+        cmake --build . -j$(nproc)
+    - name: ccache statistics
+      run: ccache -s
+

.github/workflows/docker.yml

@@ -74,7 +74,7 @@ jobs:
             TAG_PREFIX=`echo $GITHUB_REF|cut -d '/' -f3`
           fi
           tag="${DOCKERHUB_REPOSITORY}:${TAG_PREFIX}-${{ matrix.os }}"
-          echo "::set-output name=tags::$tag"
+          echo "tags=$tag" >> $GITHUB_OUTPUT
       - name: Log
         run: |
           echo ${{ steps.meta.outputs.tags }}
@@ -118,7 +118,7 @@ jobs:
         name: Create tag name
         run: |
           tag=${DOCKERHUB_REPOSITORY}:latest
-          echo "::set-output name=tags::$tag"
+          echo "tags=$tag" >> $GITHUB_OUTPUT
       - name: Log
         run: echo ${{ steps.meta.outputs.tags }}
       - name: Set up QEMU
@@ -175,7 +175,7 @@ jobs:
         name: Update tag name
         run: |
           tag="${{ steps.meta.outputs.tags }}-${{ matrix.os }}"
-          echo "::set-output name=tags::$tag"
+          echo "tags=$tag" >> $GITHUB_OUTPUT
       - name: Log
         run: |
           echo ${{ steps.meta2.outputs.tags }}

.github/workflows/gcc.yml

@@ -15,6 +15,11 @@ jobs:
   build:
     name: ${{ matrix.c }} & ${{ matrix.cpp }}
 
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}-${{
+        matrix.c }}-${{ matrix.cpp }}
+      cancel-in-progress: true
+
     runs-on: ubuntu-22.04
     strategy:
       matrix:

.github/workflows/macos.yml

@@ -14,6 +14,9 @@ on:
       - releasebranch_*
 env:
   CACHE_NUMBER: 0
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+  cancel-in-progress: true
 jobs:
   macos_build:
     name: macOS build

.github/workflows/macos_gunittest.cfg

@@ -4,6 +4,7 @@
 # space. This would be ideally empty or it would include just special cases,
 # but it includes mainly tests which can (and should) be fixed.
 exclude =
+    gui/wxpython/core/testsuite/test_gcmd.py
     gui/wxpython/core/testsuite/toolboxes.sh
     lib/init/testsuite/test_grass_tmp_mapset.py
     python/grass/gunittest/testsuite/test_assertions_rast3d.py
@@ -23,7 +24,6 @@ exclude =
     raster/r.in.pdal/testsuite/test_r_in_pdal_selection.py
     raster/r.terraflow/testsuite/test_r_terraflow.py
     raster/r.sun/testsuite/test_rsun.py
-    scripts/g.extension/testsuite/test_addons_download.py
     scripts/g.search.modules/testsuite/test_g_search_modules.py
     temporal/t.connect/testsuite/test_distr_tgis_db_raster3d.py
     temporal/t.connect/testsuite/test_distr_tgis_db_raster.py

.github/workflows/macos_install.sh

@@ -60,7 +60,7 @@ CONFIGURE_FLAGS="\
   --with-nls \
   --with-libs=${CONDA_PREFIX}/lib \
   --with-includes=${CONDA_PREFIX}/include \
-  --with-pdal=${CONDA_PREFIX}/bin/pdal-config \
+  --with-pdal \
   --with-readline \
   --with-readline-includes=${CONDA_PREFIX}/include/readline \
   --with-readline-libs=${CONDA_PREFIX}/lib
@@ -71,6 +71,8 @@ export CXXFLAGS="-O2 -pipe -stdlib=libc++ -arch ${CONDA_ARCH} -Wall -Wextra"
 
 ./configure $CONFIGURE_FLAGS
 
-make -j$(sysctl -n hw.ncpu) CFLAGS="$CFLAGS -Werror" CXXFLAGS="$CXXFLAGS -Werror"
+EXEMPT="-Wno-error=deprecated-non-prototype"
+make -j$(sysctl -n hw.ncpu) CFLAGS="$CFLAGS -Werror $EXEMPT" \
+  CXXFLAGS="$CXXFLAGS -Werror $EXEMPT"
 
 make install