Merge pull request #44 from pgRouting/develop

Preparation of release v0.4.0
pgRouting · Jul 17, 2024 · 7feac86 · 7feac86
2 parents 69083dd + 6385723
commit 7feac86
Show file tree

Hide file tree

Showing 54 changed files with 2,273 additions and 429 deletions.
diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml
@@ -1,14 +1,7 @@
 name: Boost supported versions
 
 on:
- push:
- branches-ignore:
- - 'translations_*'
- tags: []
- pull_request:
- paths-ignore:
- - '**.po'
-
+ workflow_dispatch:
 
 jobs:
  build:
@@ -30,7 +23,7 @@ jobs:
  pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
  echo "PGVER=${pgver}" >> $GITHUB_ENV
  echo "PGIS=3" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Add PostgreSQL APT repository
  run: |
@@ -80,15 +73,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  run: |

diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml
@@ -4,13 +4,7 @@ name: Check queries
 # - the latest postgis version
 
 on:
- push:
- branches-ignore:
- - 'translations_*'
- tags: []
- pull_request:
- paths-ignore:
- - '**.po'
+ workflow_dispatch:
 
 jobs:
  build:
@@ -31,7 +25,7 @@ jobs:
  echo "PGVER=${PGVER}" >> $GITHUB_ENV
  echo "PGPORT=5432" >> $GITHUB_ENV
  echo "PGIS=3" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Add PostgreSQL APT repository
  run: |
@@ -70,15 +64,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  run: |

diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -1,13 +1,7 @@
 name: Build for Ubuntu with clang
 
 on:
- push:
- branches-ignore:
- - 'translations_*'
- tags: []
- pull_request:
- paths-ignore:
- - '**.po'
+ workflow_dispatch:
 
 
 jobs:
@@ -33,7 +27,7 @@ jobs:
  PGP=5433
  if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
  echo "PGPORT=5432" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Add PostgreSQL APT repository
  run: |
@@ -73,15 +67,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  run: |

diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml
@@ -8,7 +8,8 @@ name: Check Documentation
 # - build Links
 # - English is always tested
 
-on: [push,pull_request]
+on:
+ workflow_dispatch:
 
 jobs:
  build:
@@ -38,7 +39,7 @@ jobs:
  PROCESS=${{ true }}
  fi
  echo "PROCESS=${PROCESS}" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Get postgres version
  if: env.PROCESS == 'true'
@@ -94,15 +95,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  if: env.PROCESS == 'true'

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -6,11 +6,7 @@ name: Build documentation
 # - postgis 3
 
 on:
- push:
- branches:
- - main
- tags:
- - '*'
+ workflow_dispatch:
 
 jobs:
  build:
@@ -29,7 +25,7 @@ jobs:
  pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
  echo "PGVER=${pgver}" >> $GITHUB_ENV
  echo "PGIS=3" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Add PostgreSQL APT repository
  run: |
@@ -74,15 +70,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure link checks
  run: |

diff --git a/.github/workflows/locale-and-website.yml b/.github/workflows/locale-and-website.yml
@@ -2,10 +2,6 @@ name: Update Locale and Website
 
 on:
  workflow_dispatch:
- push:
- branches:
- - main
- - develop
 
 jobs:
  release:
@@ -30,7 +26,7 @@ jobs:
  echo "PGPORT=5432" >> $GITHUB_ENV
  echo "PGIS=3" >> $GITHUB_ENV
  echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Extract branch name and commit hash
  run: |
@@ -84,15 +80,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  run: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,13 +1,7 @@
 name: Build for macOS
 
 on:
- push:
- branches-ignore:
- - 'translations_*'
- tags: []
- pull_request:
- paths-ignore:
- - '**.po'
+ workflow_dispatch:
 
 # TODO: Fix the macOS build for compiling and building VROOM with vrprouting.
 jobs:
@@ -27,11 +21,11 @@ jobs:
  run: |
  brew install openssl asio glpk
 
- - name: Build VROOM v1.11.0
+ - name: Build VROOM v1.12.0
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.11.0.tar.gz
- tar -zvxf v1.11.0.tar.gz
- cd vroom-1.11.0/src
+ wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.12.0.tar.gz
+ tar -zvxf v1.12.0.tar.gz
+ cd vroom-1.12.0/src
 
  # Source: https://github.com/VROOM-Project/vroom/issues/378
  ln -s /usr/local/opt/openssl/include/openssl /usr/local/include

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,9 +1,7 @@
 name: Release
 
 on:
- push:
- tags:
- - 'v*.*.*'
+ workflow_dispatch:
 
 
 jobs:
@@ -29,7 +27,7 @@ jobs:
  echo "PGPORT=5432" >> $GITHUB_ENV
  echo "PGIS=3" >> $GITHUB_ENV
  echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Verify Tag Name
  run: |
@@ -92,15 +90,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  run: |

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -37,7 +37,7 @@ jobs:
  PGP=5433
  if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
  echo "PGPORT=${PGP}" >> $GITHUB_ENV
- echo "VROOMVER=1.11.0" >> $GITHUB_ENV
+ echo "VROOMVER=1.12.0" >> $GITHUB_ENV
 
  - name: Add PostgreSQL APT repository
  run: |
@@ -57,7 +57,12 @@ jobs:
  postgresql-${{ matrix.psql }}-postgis-${{ matrix.postgis }} \
  postgresql-${{ matrix.psql }}-postgis-${{ matrix.postgis }}-scripts \
  postgresql-${{ matrix.psql }}-pgrouting \
- postgresql-server-dev-${{ matrix.psql }}
+ postgresql-server-dev-${{ matrix.psql }} \
+ postgresql-plpython3-${{ matrix.psql }}
+
+ - name: Install Google OR-Tools dependencies 
+ run: |
+ sudo pip install --root=/ ortools
 
  - name: Install VROOM dependencies
  run: |
@@ -76,15 +81,15 @@ jobs:
  - name: Build VROOM
  if: steps.cache-vroom.outputs.cache-hit != 'true'
  run: |
- wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
- tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
- cd ~/vroom-${{ env.VROOMVER }}/src
+ git clone --depth 1 --branch v${{ env.VROOMVER }} https://github.com/VROOM-Project/vroom ~/vroom-${{ env.VROOMVER }}
 
- # Create object file with position independent code using -fPIC flag
- sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
+ # init the required submodules
+ cd ~/vroom-${{ env.VROOMVER }}/
+ git submodule update --init
 
+ # Using "shared" target for creating Position Independent Code, disabling use of routing
  cd ~/vroom-${{ env.VROOMVER }}/src
- make
+ USE_ROUTING=false make shared
 
  - name: Configure
  run: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,9 +1,7 @@
 name: Build for Windows
 
 on:
- push:
- branches-ignore:
- - '**'
+ workflow_dispatch:
 
 jobs:
  build: