Recover macos test

.github/scripts/tidy-vs-commit.sh

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Runs clang-tidy only on changed files
+
+readonly BASE=$1
+readonly BUILD_DIR=build
+
+MODIFIED_FILES=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.c')
+MODIFIED_HEADERS=$(git diff-tree --no-commit-id --diff-filter=d --name-only -r "$BASE" HEAD | grep '\.h')
+POSTGRES_SERVER=$(grep -o -m1 '\-isystem .*' "${BUILD_DIR}/compile_commands.json" | head -1 | awk '{print $1" "$2}')
+
+echo "POSTGRES_SERVER ${POSTGRES_SERVER}"
+
+CHECKS="-checks=clang-analyzer-*"
+
+if [ -z "${MODIFIED_FILES}" ] && [ -z "${MODIFIED_HEADERS}" ]; then
+  echo "No paths modified"
+  exit 0
+fi
+
+# C/C++ use the compile command
+if [ ${#MODIFIED_FILES[@]} != 0 ] ; then
+    for f in ${MODIFIED_FILES}
+    do
+        if [ "${f##*.}" == 'conf' ]; then continue; fi
+        echo "${f}"
+        clang-tidy -p "${BUILD_DIR}" "${CHECKS}" -header-filter="^$(pwd).*" "${f}"
+       done
+fi
+
+# H/HPP do not have a compile command
+# workaround: add the includes
+if [ ${#MODIFIED_HEADERS[@]} != 0 ] ; then
+    for f in ${MODIFIED_HEADERS}
+    do
+        echo "${f}"
+        clang-tidy "${CHECKS}" -header-filter=.* "${f}" \
+            -- -I./include "${POSTGRES_SERVER}"
+    done
+fi

.github/workflows/boost_version.yml

@@ -18,10 +18,13 @@ name: Boost supported versions
 # Currently
 # - boost::geometry has not changed anything we use
 #
-# - boost::graph changed on 1.80
-# - boost::graph 1.75 requires C++14
-# - boost::graph changed on 1.68
-# - 1.56 is the minimum version we ask
+# boost::graph
+# - 1.84 is failing its own tests (Jul 2022)
+# - 1.83 transitive closure & stoer wagner changed on 83 (Jul 2022)
+# - 1.80 changed on 1.80 (Aug 2022)
+# - 1.75 requires C++14 (Dec 2020)
+# - 1.68 changed on 1.68 (Aug 2018)
+# - 1.56 is the minimum version we ask (Aug 2014)
 
 on:
   push:
@@ -65,7 +68,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          boost_minor: [56, 68, 75]
+          boost_minor: [56, 68, 75, 76, 77, 78, 79, 80, 83, 84]
 
     steps:
       - uses: actions/checkout@v4
@@ -133,5 +136,5 @@ jobs:
           sudo service postgresql start
           psql -c "CREATE DATABASE ___pgr___test___;"
           DIR=$(git rev-parse --show-toplevel)
-          bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.6.0"
+          bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.7.0"
           pg_prove  -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap"

.github/workflows/check-files.yml

@@ -33,8 +33,8 @@ jobs:
       - name: News file up to date
         run: |
           tools/release-scripts/notes2news.pl
-          if git status | grep 'NEWS'; then echo "NEWS is not up to date"; exit 1; fi
-          if ! grep -q $(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) NEWS; then echo "Missing section in NEWS"; exit 1; fi
+          if git status | grep 'NEWS.md'; then echo "NEWS.md is not up to date"; exit 1; fi
+          if ! grep -q $(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) NEWS.md; then echo "Missing section in NEWS.md"; exit 1; fi
 
   License_check:
     runs-on: ubuntu-latest

.github/workflows/check-queries.yml

@@ -113,7 +113,7 @@ jobs:
           TESTDIRS="version"
           for d in ${TESTDIRS}
           do
-            ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "${d}"
+            ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "docqueries/${d}"
           done
 
           ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}"

.github/workflows/doc-check.yml

@@ -52,7 +52,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          language: [en,es]
+          language: [en,es,zh_Hans]
 
     steps:
       - uses: actions/checkout@v4
@@ -65,6 +65,8 @@ jobs:
           # allways processing english, no matter what the change was
           if [[ "${{ matrix.language }}" == "en" ]]; then echo "PROCESS=true" >> $GITHUB_ENV; exit 0; fi
 
+          if [[ "${{ matrix.language }}" == "zh_Hans" && "${{ github.repository_owner }}" != "pgRouting" ]]; then echo "PROCESS=false" >> $GITHUB_ENV; exit 0; fi
+
           # when this file changes  all languages are tested
           if git diff --name-only HEAD^ HEAD | grep -q '.github/workflows/doc-check.yml' ; then  echo "PROCESS=true" >> $GITHUB_ENV; exit 0; fi
 
@@ -119,7 +121,7 @@ jobs:
           mkdir build
           cd build
           cmake -DLINKCHECK=ON -DWITH_DOC=ON \
-                -DES=ON -DBUILD_DOXY=ON \
+                -DES=ON -DZH_HANS=ON -DBUILD_DOXY=ON \
                 -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release ..
 
       - name: Check Documentation

.github/workflows/macos.yml

@@ -5,6 +5,31 @@ name: Build for macOS
 
 on:
   workflow_dispatch:
+  push:
+    paths:
+      - '.github/workflows/macos.yml'
+      - 'src/**'
+      - 'include/**'
+      - 'pgtap/**'
+      - 'tools/testers/**'
+      - './CMakeLists.txt'
+
+    branches-ignore:
+      - 'gh-pages'
+
+    tags: []
+
+  pull_request:
+    paths:
+      - '.github/workflows/macos.yml'
+      - 'src/**'
+      - 'include/**'
+      - 'pgtap/**'
+      - 'tools/testers/**'
+      - './CMakeLists.txt'
+
+    branches-ignore:
+      - 'gh-pages'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -16,7 +41,12 @@ permissions:
 jobs:
   build:
     name: macos
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, macos-14]
 
     steps:
       - name: Checkout repository
@@ -36,22 +66,21 @@ jobs:
         run: |
           cd build
           make -j
-          sudo make install
+          make install
 
       - name: Install pgTAP
         run: |
           git clone https://github.com/theory/pgtap.git pgTapExtension
           cd pgTapExtension
           make -j
-          sudo make install
-          sudo cpan TAP::Parser::SourceHandler::pgTAP
-          sudo find /usr/local -name pg_prove
-          sudo ln -s  /usr/local/Cellar/perl/5.32.1_1/bin/pg_prove  symlink it into /usr/local/bin
+          make install
+          cpan TAP::Parser::SourceHandler::pgTAP
+          ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin
 
       - name: Test
         run: |
-          export PATH=/usr/local/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
-          pg_ctl -D /usr/local/var/postgres start
+          export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
+          pg_ctl -D $(brew --prefix)/var/postgresql@14 start
           createuser -s postgres
           createdb ___pgr___test___
           bash ./tools/testers/pg_prove_tests.sh postgres 5432 Release

.github/workflows/release.yml

@@ -153,7 +153,7 @@ jobs:
           tar -zcvf doc-v${PGROUTING_VERSION}-es.tar.gz doc-v${PGROUTING_VERSION}-es
 
           cd ../..
-          grep -Pzo "(?s)pgRouting ${PGROUTING_VERSION//./\\.} Release Notes.*?(?=pgRouting .\..\.. Release Notes)" NEWS | tr '\0' '\n' > release_body.txt
+          grep -Pzo "(?s)pgRouting ${PGROUTING_VERSION//./\\.} Release Notes.*?(?=pgRouting .\..\.. Release Notes)" NEWS.md | tr '\0' '\n' > release_body.txt
           echo "**Attachments**" >> release_body.txt
           echo "File | Contents" >> release_body.txt
           echo "| --- | --- |" >> release_body.txt

.github/workflows/tidy-check.yml

@@ -0,0 +1,58 @@
+name: clang-tidy check
+
+on:
+  pull_request:
+    branches-ignore:
+      - 'gh-pages'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check-changelog:
+    name: Check for changelog entry
+    runs-on: ubuntu-latest
+    env:
+      PR_BASE: ${{ github.base_ref }}
+
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Get postgres version
+        run: |
+          sudo service postgresql start
+          pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()')
+          echo "PGVER=${pgver}" >> $GITHUB_ENV
+          echo "PGPORT=5432" >> $GITHUB_ENV
+
+      - name: Add PostgreSQL APT repository
+        run: |
+          sudo apt-get install curl ca-certificates gnupg
+          curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
+            $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            libboost-graph-dev \
+            postgresql-${PGVER} \
+            postgresql-server-dev-${PGVER}
+
+      - name: Configure
+        run: |
+          export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
+          mkdir build
+          cd build
+          cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWITH_DOC=OFF ..
+
+      - name: Add upstream
+        run: |
+          git remote add upstream https://github.com/pgRouting/pgrouting
+          git fetch upstream ${PR_BASE}
+
+      - name: do clang-tidy
+        run: .github/scripts/tidy-vs-commit.sh "upstream/${PR_BASE}"

.github/workflows/ubuntu.yml

@@ -29,7 +29,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          psql: [11,12,13,14,15]
+          psql: [12,13,14,15,16]
           postgis: [3]
           os: [ubuntu-latest, ubuntu-20.04]
 

.github/workflows/update.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          old_pgr: [3.5.1, 3.5.0, 3.4.2, 3.4.1, 3.4.0, 3.3.5, 3.3.4, 3.3.3, 3.3.2, 3.3.1, 3.3.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.6, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1, 3.2.2]
+          old_pgr: [3.6.2, 3.6.1, 3.6.0, 3.5.1, 3.5.0, 3.4.2, 3.4.1, 3.4.0, 3.3.5, 3.3.4, 3.3.3, 3.3.2, 3.3.1, 3.3.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.0.6, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.2.0, 3.2.1, 3.2.2]
 
     steps:
       - uses: actions/checkout@v4
@@ -122,6 +122,6 @@ jobs:
         run: |
           sudo service postgresql start
           psql -p "${PGPORT}"  -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();"
-          psql -p "${PGPORT}"  -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE  TO '3.6.0';"
+          psql -p "${PGPORT}"  -d ___pgr___test___ -c "ALTER EXTENSION pgrouting UPDATE  TO '3.7.0';"
           psql -p "${PGPORT}"  -d ___pgr___test___ -c "SELECT * FROM pgr_full_version();"
           pg_prove  -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap"

CMakeLists.txt

@@ -18,9 +18,9 @@ include(pgr/BuildType)
 #---------------------------------------------
 #---------------------------------------------
 
-project(PGROUTING VERSION 3.6.0
+project(PGROUTING VERSION 3.7.0
     LANGUAGES C CXX )
-set(PROJECT_VERSION_DEV "")
+set(PROJECT_VERSION_DEV "-dev")
 string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
 
 include(pgr/GitInfo)
@@ -31,8 +31,11 @@ set(PROJECT_LIB_NAME "${PROJECT_NAME_LOWER}-${PROJECT_LIB_VERSION}")
 
 string(TIMESTAMP COMPILATION_DATE "%Y/%m/%d" UTC)
 
-set(MINORS 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
+set(MINORS 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0 2.6)
 set(OLD_SIGNATURES
+    3.6.2
+    3.6.1
+    3.6.0
     3.5.1
     3.5.0
     3.4.2