Skip to content

Commit 0de911e

Browse files
krashish8krashish8
authored
Merge pull request #32 from pgRouting/develop
Preparation of release 0.3.0
2 parents fdda73f + c68b49a commit 0de911e

File tree

143 files changed

+23127
-2353
lines changed

Some content is hidden

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

143 files changed

+23127
-2353
lines changed

‎.github/workflows/boost_version.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
3131
echo "PGVER=${pgver}" >> $GITHUB_ENV
3232
echo "PGIS=3" >> $GITHUB_ENV
33+
echo "VROOMVER=1.11.0" >> $GITHUB_ENV
3334
3435
- name: Add PostgreSQL APT repository
3536
run: |
@@ -66,25 +67,35 @@ jobs:
6667
run: |
6768
sudo apt-get install libssl-dev libasio-dev libglpk-dev
6869
69-
- name: Build VROOM v1.10.0
70+
- name: Cache VROOM
71+
id: cache-vroom
72+
uses: actions/cache@v2
73+
env:
74+
cache-name: vroom
75+
with:
76+
path: |
77+
~/vroom-${{ env.VROOMVER }}
78+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}
79+
80+
- name: Build VROOM
81+
if: steps.cache-vroom.outputs.cache-hit != 'true'
7082
run: |
71-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
72-
tar -zvxf v1.10.0.tar.gz
73-
cd vroom-1.10.0/src
83+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
84+
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
85+
cd ~/vroom-${{ env.VROOMVER }}/src
7486
7587
# Create object file with position independent code using -fPIC flag
7688
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
7789
90+
cd ~/vroom-${{ env.VROOMVER }}/src
7891
make
79-
cd ..
80-
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV
8192
8293
- name: Configure
8394
run: |
8495
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
8596
mkdir build
8697
cd build
87-
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
98+
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..
8899
89100
- name: Build
90101
run: |

‎.github/workflows/check-queries.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
echo "PGVER=${PGVER}" >> $GITHUB_ENV
3232
echo "PGPORT=5432" >> $GITHUB_ENV
3333
echo "PGIS=3" >> $GITHUB_ENV
34+
echo "VROOMVER=1.11.0" >> $GITHUB_ENV
3435
3536
- name: Add PostgreSQL APT repository
3637
run: |
@@ -56,25 +57,35 @@ jobs:
5657
run: |
5758
sudo apt-get install libssl-dev libasio-dev libglpk-dev
5859
59-
- name: Build VROOM v1.10.0
60+
- name: Cache VROOM
61+
id: cache-vroom
62+
uses: actions/cache@v2
63+
env:
64+
cache-name: vroom
65+
with:
66+
path: |
67+
~/vroom-${{ env.VROOMVER }}
68+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}
69+
70+
- name: Build VROOM
71+
if: steps.cache-vroom.outputs.cache-hit != 'true'
6072
run: |
61-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
62-
tar -zvxf v1.10.0.tar.gz
63-
cd vroom-1.10.0/src
73+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
74+
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
75+
cd ~/vroom-${{ env.VROOMVER }}/src
6476
6577
# Create object file with position independent code using -fPIC flag
6678
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
6779
80+
cd ~/vroom-${{ env.VROOMVER }}/src
6881
make
69-
cd ..
70-
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV
7182
7283
- name: Configure
7384
run: |
7485
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
7586
mkdir build
7687
cd build
77-
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
88+
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..
7889
7990
- name: Build
8091
run: |

‎.github/workflows/clang.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
PGP=5433
3434
if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi
3535
echo "PGPORT=5432" >> $GITHUB_ENV
36+
echo "VROOMVER=1.11.0" >> $GITHUB_ENV
3637
3738
- name: Add PostgreSQL APT repository
3839
run: |
@@ -59,25 +60,35 @@ jobs:
5960
run: |
6061
sudo apt-get install libssl-dev libasio-dev libglpk-dev
6162
62-
- name: Build VROOM v1.10.0
63+
- name: Cache VROOM
64+
id: cache-vroom
65+
uses: actions/cache@v2
66+
env:
67+
cache-name: vroom
68+
with:
69+
path: |
70+
~/vroom-${{ env.VROOMVER }}
71+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}
72+
73+
- name: Build VROOM
74+
if: steps.cache-vroom.outputs.cache-hit != 'true'
6375
run: |
64-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
65-
tar -zvxf v1.10.0.tar.gz
66-
cd vroom-1.10.0/src
76+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
77+
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
78+
cd ~/vroom-${{ env.VROOMVER }}/src
6779
6880
# Create object file with position independent code using -fPIC flag
6981
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
7082
83+
cd ~/vroom-${{ env.VROOMVER }}/src
7184
make
72-
cd ..
73-
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV
7485
7586
- name: Configure
7687
run: |
7788
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
7889
mkdir build
7990
cd build
80-
CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
91+
CXX=clang++ CC=clang cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=${{ matrix.release }} -DWITH_DOC=OFF -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..
8192
8293
- name: Build
8394
run: |

‎.github/workflows/doc-check.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
PROCESS=${{ true }}
3939
fi
4040
echo "PROCESS=${PROCESS}" >> $GITHUB_ENV
41+
echo "VROOMVER=1.11.0" >> $GITHUB_ENV
4142
4243
- name: Get postgres version
4344
if: env.PROCESS == 'true'
@@ -80,18 +81,28 @@ jobs:
8081
run: |
8182
sudo apt-get install libssl-dev libasio-dev libglpk-dev
8283
83-
- name: Build VROOM v1.10.0
84+
- name: Cache VROOM
85+
id: cache-vroom
86+
uses: actions/cache@v2
87+
env:
88+
cache-name: vroom
89+
with:
90+
path: |
91+
~/vroom-${{ env.VROOMVER }}
92+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}
93+
94+
- name: Build VROOM
95+
if: steps.cache-vroom.outputs.cache-hit != 'true'
8496
run: |
85-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
86-
tar -zvxf v1.10.0.tar.gz
87-
cd vroom-1.10.0/src
97+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
98+
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
99+
cd ~/vroom-${{ env.VROOMVER }}/src
88100
89101
# Create object file with position independent code using -fPIC flag
90102
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
91103
104+
cd ~/vroom-${{ env.VROOMVER }}/src
92105
make
93-
cd ..
94-
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV
95106
96107
- name: Configure
97108
if: env.PROCESS == 'true'
@@ -102,7 +113,7 @@ jobs:
102113
cmake -DLINKCHECK=ON -DHTML=ON -DWITH_DOC=ON \
103114
-DDE=ON -DES=ON -DFR=ON -DJA=ON -DIT=ON \
104115
-DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release \
105-
-DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
116+
-DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..
106117
107118
- name: Check Links
108119
if: env.PROCESS == 'true'

‎.github/workflows/documentation.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()')
3030
echo "PGVER=${pgver}" >> $GITHUB_ENV
3131
echo "PGIS=3" >> $GITHUB_ENV
32+
echo "VROOMVER=1.11.0" >> $GITHUB_ENV
3233
3334
- name: Add PostgreSQL APT repository
3435
run: |
@@ -60,18 +61,28 @@ jobs:
6061
run: |
6162
sudo apt-get install libssl-dev libasio-dev libglpk-dev
6263
63-
- name: Build VROOM v1.10.0
64+
- name: Cache VROOM
65+
id: cache-vroom
66+
uses: actions/cache@v2
67+
env:
68+
cache-name: vroom
69+
with:
70+
path: |
71+
~/vroom-${{ env.VROOMVER }}
72+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}
73+
74+
- name: Build VROOM
75+
if: steps.cache-vroom.outputs.cache-hit != 'true'
6476
run: |
65-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
66-
tar -zvxf v1.10.0.tar.gz
67-
cd vroom-1.10.0/src
77+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
78+
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
79+
cd ~/vroom-${{ env.VROOMVER }}/src
6880
6981
# Create object file with position independent code using -fPIC flag
7082
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
7183
84+
cd ~/vroom-${{ env.VROOMVER }}/src
7285
make
73-
cd ..
74-
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV
7586
7687
- name: Configure link checks
7788
run: |
@@ -80,7 +91,7 @@ jobs:
8091
cd build
8192
cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Release \
8293
-DWITH_DOC=ON -DES=ON \
83-
-DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
94+
-DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..
8495
8596
- name: Build Documentation
8697
run: |

‎.github/workflows/publish-doc.yml renamed to ‎.github/workflows/locale-and-website.yml

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Users Documentation
1+
name: Update Locale and Website
22

33
on:
44
workflow_dispatch:
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
release:
12-
name: Publish Users Documentation
12+
name: Update Locale and Website
1313
runs-on: ubuntu-latest
1414

1515
strategy:
@@ -30,11 +30,11 @@ jobs:
3030
echo "PGPORT=5432" >> $GITHUB_ENV
3131
echo "PGIS=3" >> $GITHUB_ENV
3232
echo "PROJECT_VERSION=${PROJECT_VERSION}" >> $GITHUB_ENV
33+
echo "VROOMVER=1.11.0" >> $GITHUB_ENV
3334
3435
- name: Extract branch name and commit hash
3536
run: |
36-
raw=$(git branch -r --contains ${{ github.ref }})
37-
branch=${raw##*/}
37+
branch=${GITHUB_REF#refs/heads/}
3838
echo "BRANCH=$branch" >> $GITHUB_ENV
3939
git_hash=$(git rev-parse --short "$GITHUB_SHA")
4040
echo "GIT_HASH=$git_hash" >> $GITHUB_ENV
@@ -63,37 +63,50 @@ jobs:
6363
graphviz \
6464
doxygen
6565
python -m pip install --upgrade pip
66-
pip install Sphinx
67-
pip install sphinx-bootstrap-theme
66+
pip install -r requirements.txt
67+
pip install sphinx-intl[transifex]
6868
pip list
6969
7070
- name: Install VROOM dependencies
7171
run: |
7272
sudo apt-get install libssl-dev libasio-dev libglpk-dev
7373
74-
- name: Build VROOM v1.10.0
74+
- name: Cache VROOM
75+
id: cache-vroom
76+
uses: actions/cache@v2
77+
env:
78+
cache-name: vroom
79+
with:
80+
path: |
81+
~/vroom-${{ env.VROOMVER }}
82+
key: ${{ runner.os }}-${{ env.cache-name }}-${{ env.VROOMVER }}
83+
84+
- name: Build VROOM
85+
if: steps.cache-vroom.outputs.cache-hit != 'true'
7586
run: |
76-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
77-
tar -zvxf v1.10.0.tar.gz
78-
cd vroom-1.10.0/src
87+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v${{ env.VROOMVER }}.tar.gz -O /tmp/${{ env.VROOMVER }}.tar.gz
88+
tar -zvxf /tmp/${{ env.VROOMVER }}.tar.gz -C ~/
89+
cd ~/vroom-${{ env.VROOMVER }}/src
7990
8091
# Create object file with position independent code using -fPIC flag
8192
sed -i 's/CXXFLAGS = /CXXFLAGS = -fPIC /' makefile
8293
94+
cd ~/vroom-${{ env.VROOMVER }}/src
8395
make
84-
cd ..
85-
echo "VROOM_INSTALL_PATH=$(pwd)" >> $GITHUB_ENV
8696
8797
- name: Configure
8898
run: |
8999
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
90100
mkdir build
91101
cd build
92-
cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DES=ON -DVROOM_INSTALL_PATH=${VROOM_INSTALL_PATH} ..
102+
cmake -DPOSTGRESQL_VERSION=${PGVER} -DDOC_USE_BOOTSTRAP=ON -DWITH_DOC=ON -DBUILD_DOXY=ON -DCMAKE_BUILD_TYPE=Release -DLOCALE=ON -DES=ON -DVROOM_INSTALL_PATH=$HOME/vroom-${{ env.VROOMVER }} ..
93103
94104
- name: Build
95105
run: |
96106
cd build
107+
if [[ "${{ env.BRANCH }}" == "develop" ]]; then
108+
make locale
109+
fi
97110
make doc
98111
make doxy
99112
@@ -102,6 +115,23 @@ jobs:
102115
git config user.name "github-actions[bot]"
103116
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
104117
118+
- name: Update locale
119+
if: github.ref == 'refs/heads/develop'
120+
run: |
121+
# List all the files that needs to be committed in build/doc/locale_changes.txt
122+
awk '/^Update|^Create/{print $2}' build/doc/locale_changes.txt > tmp && mv tmp build/doc/locale_changes.txt # .po files
123+
cat build/doc/locale_changes.txt | perl -pe 's/(.*)en\/LC_MESSAGES(.*)/$1pot$2t/' >> build/doc/locale_changes.txt # .pot files
124+
cat build/doc/locale_changes.txt
125+
# Remove obsolete entries #~ from .po files
126+
tools/transifex/remove_obsolete_entries.sh
127+
# Add the files, commit and push
128+
for line in `cat build/doc/locale_changes.txt`; do git add "$line"; done
129+
git diff --staged --quiet || git commit -m "Update locale: commit ${{ env.GIT_HASH }}"
130+
git fetch origin
131+
git reset --hard # Remove the unstaged changes before rebasing
132+
git rebase origin/develop
133+
git push origin develop
134+
105135
- name: Update Users Documentation
106136
run: |
107137
if [[ "${{ env.BRANCH }}" == "main" ]]; then

‎.github/workflows/macos.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ jobs:
2727
run: |
2828
brew install openssl asio glpk
2929
30-
- name: Build VROOM v1.10.0
30+
- name: Build VROOM v1.11.0
3131
run: |
32-
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.10.0.tar.gz
33-
tar -zvxf v1.10.0.tar.gz
34-
cd vroom-1.10.0/src
32+
wget https://github.com/VROOM-Project/vroom/archive/refs/tags/v1.11.0.tar.gz
33+
tar -zvxf v1.11.0.tar.gz
34+
cd vroom-1.11.0/src
3535
3636
# Source: https://github.com/VROOM-Project/vroom/issues/378
3737
ln -s /usr/local/opt/openssl/include/openssl /usr/local/include

0 commit comments

Comments
 (0)