Merge branch 'develop'

pgRouting · May 25, 2021 · 3d159cb · 3d159cb
2 parents e553e4c + 3736878
commit 3d159cb
Show file tree

Hide file tree

Showing 1,184 changed files with 68,579 additions and 99,256 deletions.
diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml
@@ -18,7 +18,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- boost_minor: [53, 54, 55, 56, 74, 75]
+ boost_minor: [56, 74, 75]
  os: [ubuntu-latest]
 
  steps:

diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml
@@ -34,6 +34,9 @@ jobs:
  if [[ $(git log --format=%B -n 2 | tr -d "'" | tr -d " " | grep -Po '(?<=\.po)[^;]+') == *"${LANG_MSG}"* ]]; then
  PROCESS=${{ true }}
  fi
+ if [[ $(git log --format=%B -n 2 | tr -d "'" | tr -d " " | grep "\[${{ matrix.language }}\]") ]]; then
+ PROCESS=${{ true }}
+ fi
  if [[ "${{ matrix.language }}" == "en" ]]; then
  PROCESS=${{ true }}
  fi

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -17,7 +17,7 @@ jobs:
  steps:
  - name: Checkout repository
  uses: actions/checkout@v2
- 
+
  - name: install deps
  run: |
  brew install postgresql postgis boost
@@ -40,7 +40,9 @@ jobs:
  cd pgTapExtension
  make -j
  sudo make install
- cpan TAP::Parser::SourceHandler::pgTAP
+ 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
 
  - name: Test
  run: |