Skip to content

Commit 91929d9

Browse files
authored
Merge pull request #2970 from cvvergara/pumpup-to-alpha1
Creation of pgrouting version 4.0.0-alpha1
2 parents 148e09b + 105513c commit 91929d9

File tree

994 files changed

+79005
-72520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

994 files changed

+79005
-72520
lines changed

.clang-tidy

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Checks: >
2+
google-*,
3+
-google-readability-casting,
4+
clang-analyzer-*,
5+
clang-diagnostic-*,
6+
cppcoreguidelines-avoid-capturing-lambda-coroutines,
7+
cppcoreguidelines-avoid-goto,
8+
cppcoreguidelines-avoid-non-const-global-variables,
9+
cppcoreguidelines-avoid-reference-coroutine-parameters
10+
11+
WarningsAsErrors: ''
12+
HeaderFilterRegex: './include'
13+
FormatStyle: none
14+
InheritParentConfig: true

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

Lines changed: 0 additions & 39 deletions
This file was deleted.

tools/transifex/update_locale.sh renamed to .github/scripts/update_locale.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
# ------------------------------------------------------------------------------
2121

2222

23-
2423
DIR=$(git rev-parse --show-toplevel)
2524

2625
pushd "${DIR}" > /dev/null || exit 1
2726

2827
mkdir -p build
2928
pushd build > /dev/null || exit 1
30-
cmake -DWITH_DOC=ON -DCMAKE_BUILD_TYPE=Release -DLOCALE=ON ..
29+
cmake -DBUILD_HTML=OFF -DBUILD_LOCALE=ON ..
3130

3231
make locale
3332
popd > /dev/null || exit 1
@@ -39,7 +38,9 @@ perl -ne '/\/en\// && print' build/doc/locale_changes_po.txt | \
3938
perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/doc/locale_changes_po_pot.txt # .pot files
4039

4140
# Remove obsolete entries #~ from .po files
42-
bash tools/transifex/remove_obsolete_entries.sh
41+
find locale -type f -name '*.po' -exec sh -c '
42+
msgattrib --no-obsolete -o "$f" "$f"
43+
' sh {} \;
4344

4445
while read -r f; do git add "$f"; done < build/doc/locale_changes_po_pot.txt
4546

.github/workflows/boost_version.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,19 @@ on:
3636
- 'include/**'
3737
- 'pgtap/**'
3838
- 'tools/testers/**'
39-
- './CMakeLists.txt'
39+
- 'CMakeLists.txt'
4040

4141
branches-ignore:
4242
- 'gh-pages'
4343

44-
tags: []
45-
4644
pull_request:
4745
paths:
4846
- '.github/workflows/boost_version.yml'
4947
- 'src/**'
5048
- 'include/**'
5149
- 'pgtap/**'
5250
- 'tools/testers/**'
53-
- './CMakeLists.txt'
51+
- 'CMakeLists.txt'
5452

5553
branches-ignore:
5654
- 'gh-pages'
@@ -131,5 +129,5 @@ jobs:
131129
sudo service postgresql start
132130
psql -c "CREATE DATABASE ___pgr___test___;"
133131
DIR=$(git rev-parse --show-toplevel)
134-
bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "3.8.0"
132+
bash "${DIR}/tools/testers/setup_db.sh" "${PGPORT}" ___pgr___test___ "${PG_RUNNER_USER}" "4.0.0"
135133
pg_prove -Q -f --normalize --directives --recurse -U "${PG_RUNNER_USER}" -d ___pgr___test___ "pgtap"

.github/workflows/centos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
- 'include/**'
1313
- 'pgtap/**'
1414
- 'tools/testers/**'
15-
- './CMakeLists.txt'
15+
- 'CMakeLists.txt'
1616

1717
branches-ignore:
1818
- 'gh-pages'

.github/workflows/check-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
steps:
6464
- name: Checkout
6565
uses: actions/checkout@v5
66-
- name: Install Requirements
66+
- name: Checkout cpplint
6767
uses: actions/checkout@v5
6868
with:
6969
repository: 'cpplint/cpplint'

.github/workflows/check-queries.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ on:
2626
branches-ignore:
2727
- 'gh-pages'
2828

29-
tags: []
30-
3129
pull_request:
3230
paths:
3331
- '.github/workflows/check-queries.yml'
@@ -50,7 +48,7 @@ permissions:
5048

5149
jobs:
5250
build:
53-
name: Check queries
51+
name: Build
5452
runs-on: ubuntu-latest
5553

5654
strategy:
@@ -78,6 +76,7 @@ jobs:
7876
run: |
7977
sudo apt-get update
8078
sudo apt-get install -y \
79+
doxygen graphviz \
8180
libboost-graph-dev \
8281
libtap-parser-sourcehandler-pgtap-perl \
8382
postgresql-${PGVER} \
@@ -91,7 +90,7 @@ jobs:
9190
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
9291
mkdir build
9392
cd build
94-
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug ..
93+
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DBUILD_DOXY=ON ..
9594
9695
- name: Build
9796
run: |
@@ -121,3 +120,11 @@ jobs:
121120
done
122121
123122
./tools/testers/doc_queries_generator.pl -pgver "${PGVER}"
123+
124+
- name: Check Developers Documentation
125+
run: |
126+
cd build
127+
make doxy
128+
more DOXYLOG
129+
[ ! -s DOXYLOG ] || echo "There are Doxygen warnings"
130+
[ ! -s DOXYLOG ] || exit 1

.github/workflows/clang.yml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,19 @@ on:
1919
- 'include/**'
2020
- 'pgtap/**'
2121
- 'tools/testers/**'
22-
- './CMakeLists.txt'
22+
- 'CMakeLists.txt'
2323

2424
branches-ignore:
2525
- 'gh-pages'
2626

27-
tags: []
28-
2927
pull_request:
3028
paths:
3129
- '.github/workflows/clang.yml'
3230
- 'src/**'
3331
- 'include/**'
3432
- 'pgtap/**'
3533
- 'tools/testers/**'
36-
- './CMakeLists.txt'
34+
- 'CMakeLists.txt'
3735

3836
branches-ignore:
3937
- 'gh-pages'
@@ -48,10 +46,13 @@ permissions:
4846
jobs:
4947
Test_clang:
5048
name: Ubuntu clang
51-
runs-on: ubuntu-latest
49+
runs-on: ${{ matrix.os }}
5250

5351
strategy:
5452
fail-fast: false
53+
matrix:
54+
release: [Debug, Release]
55+
os: [ubuntu-latest, ubuntu-22.04]
5556

5657
steps:
5758
- uses: actions/checkout@v5
@@ -64,12 +65,21 @@ jobs:
6465
echo "PGIS=3" >> $GITHUB_ENV
6566
echo "PGPORT=5432" >> $GITHUB_ENV
6667
68+
- name: 'Raise Priority for apt.postgresql.org'
69+
run: |
70+
cat << EOF >> ./pgdg.pref
71+
Package: *
72+
Pin: release o=apt.postgresql.org
73+
Pin-Priority: 600
74+
EOF
75+
sudo mv ./pgdg.pref /etc/apt/preferences.d/
76+
sudo apt update
77+
6778
- name: Add PostgreSQL APT repository
6879
run: |
69-
sudo apt-get install curl ca-certificates gnupg
70-
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
71-
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
72-
$(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
80+
sudo apt-get -y purge postgresql-*
81+
sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg-testing main ${PGVER}" > /etc/apt/sources.list.d/pgdg.list'
82+
curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg >/dev/null
7383
7484
- name: Install dependencies
7585
run: |
@@ -84,12 +94,14 @@ jobs:
8494
postgresql-${PGVER}-postgis-${PGIS}-scripts \
8595
postgresql-server-dev-${PGVER}
8696
87-
- name: Configure
97+
- name: Configure for clang
8898
run: |
8999
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
90100
mkdir build
91101
cd build
92-
CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF ..
102+
CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} \
103+
-DCMAKE_BUILD_TYPE=${{ matrix.release }} -DBUILD_HTML=OFF -DBUILD_DOXY=OFF \
104+
-DUSE_CLANG_TIDY=ON ..
93105
94106
- name: Build
95107
run: |

.github/workflows/doc-check.yml

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ on:
2525
branches-ignore:
2626
- 'gh-pages'
2727

28-
tags: []
29-
3028
pull_request:
3129
paths:
3230
- '.github/workflows/doc-check.yml'
@@ -52,7 +50,7 @@ jobs:
5250
strategy:
5351
fail-fast: false
5452
matrix:
55-
language: [en,es,zh_Hans]
53+
language: [en, es, zh_Hans, sv]
5654

5755
steps:
5856
- uses: actions/checkout@v5
@@ -62,7 +60,7 @@ jobs:
6260
- name: check modified files
6361
id: check_files
6462
run: |
65-
# allways processing english, no matter what the change was
63+
# always processing english, no matter what the change was
6664
if [[ "${{ matrix.language }}" == "en" ]]; then echo "PROCESS=true" >> $GITHUB_ENV; exit 0; fi
6765
6866
# when this file changes all languages are tested
@@ -103,38 +101,28 @@ jobs:
103101
sudo apt-get update
104102
sudo apt-get install -y \
105103
libboost-graph-dev \
104+
python3-sphinx \
105+
python3-sphinx-bootstrap-theme \
106106
postgresql-${PGVER} \
107107
postgresql-server-dev-${PGVER} \
108-
graphviz \
109-
doxygen
110-
python -m pip install --upgrade pip
111-
pip install -r requirements.txt
112-
pip list
113-
108+
graphviz
114109
115110
- name: Configure
116111
if: env.PROCESS == 'true'
117112
run: |
118113
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
119114
mkdir build
120115
cd build
121-
cmake -DLINKCHECK=ON -DWITH_DOC=ON \
122-
-DES=ON -DZH_HANS=ON -DBUILD_DOXY=ON \
123-
-DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release ..
116+
cmake -DBUILD_LINKCHECK=ON \
117+
-DSPHINX_FLAGS='-W -v -j auto --keep-going' \
118+
-DPOSTGRESQL_VERSION=${PGVER} ..
124119
125120
- name: Check Documentation
126121
if: env.PROCESS == 'true'
127122
run: |
128123
cd build
129124
make html-${{ matrix.language }}
130125
131-
- name: Check Developers Documentation
132-
if: env.PROCESS == 'true'
133-
run: |
134-
cd build
135-
make doxy
136-
[ ! -s build/doxygen/LOG ] || exit 1
137-
138126
- name: Check Links
139127
if: env.CHK_LINK == 'true'
140128
run: |

.github/workflows/macos.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,19 @@ on:
1212
- 'include/**'
1313
- 'pgtap/**'
1414
- 'tools/testers/**'
15-
- './CMakeLists.txt'
15+
- 'CMakeLists.txt'
1616

1717
branches-ignore:
1818
- 'gh-pages'
1919

20-
tags: []
21-
2220
pull_request:
2321
paths:
2422
- '.github/workflows/macos.yml'
2523
- 'src/**'
2624
- 'include/**'
2725
- 'pgtap/**'
2826
- 'tools/testers/**'
29-
- './CMakeLists.txt'
27+
- 'CMakeLists.txt'
3028

3129
branches-ignore:
3230
- 'gh-pages'

0 commit comments

Comments
 (0)