diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml index 5f0aed61cf6..f06466567ef 100644 --- a/.github/workflows/boost_version.yml +++ b/.github/workflows/boost_version.yml @@ -73,7 +73,7 @@ jobs: - name: Get postgres version run: | sudo service postgresql start - pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') echo "PGVER=${pgver}" >> $GITHUB_ENV echo "PGIS=3" >> $GITHUB_ENV PG_USER=$(whoami) diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml index dd7bbee4c6d..0e7adb2d27e 100644 --- a/.github/workflows/check-queries.yml +++ b/.github/workflows/check-queries.yml @@ -61,7 +61,7 @@ jobs: - name: get postgres version run: | sudo service postgresql start - PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') echo "PGVER=${PGVER}" >> $GITHUB_ENV echo "PGPORT=5432" >> $GITHUB_ENV echo "PGIS=3" >> $GITHUB_ENV diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml index 5ddee6eeffb..bd3a3611b11 100644 --- a/.github/workflows/clang.yml +++ b/.github/workflows/clang.yml @@ -58,7 +58,7 @@ jobs: - name: Get postgres version run: | sudo service postgresql start - pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') echo "PGVER=${pgver}" >> $GITHUB_ENV echo "PGIS=3" >> $GITHUB_ENV echo "PGPORT=5432" >> $GITHUB_ENV diff --git a/.github/workflows/doc-check.yml b/.github/workflows/doc-check.yml index 6c367348032..1593d748c0c 100644 --- a/.github/workflows/doc-check.yml +++ b/.github/workflows/doc-check.yml @@ -80,7 +80,7 @@ jobs: if: env.PROCESS == 'true' run: | sudo service postgresql start - pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') echo "PGVER=${pgver}" >> $GITHUB_ENV - name: Add PostgreSQL APT repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 88b39a18a0c..8c439e7e573 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Get postgres version run: | sudo service postgresql start - PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') PGROUTING_VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) echo "PGVER=${PGVER}" >> $GITHUB_ENV echo "PGPORT=5432" >> $GITHUB_ENV diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4a9b1e93100..f8669227c1f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -39,7 +39,7 @@ jobs: - name: get postgres version run: | sudo service postgresql start - pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') echo "PGVER=${pgver}" >> $GITHUB_ENV PGP=5433 if [ "${{ matrix.psql }}" == "${pgver}" ]; then PGP=5432; fi diff --git a/.github/workflows/update-locale.yml b/.github/workflows/update-locale.yml index cccb71ff77e..efea648f014 100644 --- a/.github/workflows/update-locale.yml +++ b/.github/workflows/update-locale.yml @@ -34,7 +34,7 @@ jobs: - name: Get postgres version run: | sudo service postgresql start - PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') PROJECT_VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) echo "PGVER=${PGVER}" >> $GITHUB_ENV echo "PGPORT=5432" >> $GITHUB_ENV diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index b9515f647ac..502f650c409 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -36,7 +36,7 @@ jobs: - name: Get postgres version run: | sudo service postgresql start - pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + pgver=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') echo "PGVER=${pgver}" >> $GITHUB_ENV echo "PGIS=3" >> $GITHUB_ENV PG_USER=$(whoami) diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index d0fb85e7794..e653cc8b5a1 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -35,7 +35,7 @@ jobs: - name: Get postgres version run: | sudo service postgresql start - PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d \()') + PGVER=$(psql --version | grep -Po '(?<=psql \(PostgreSQL\) )[^;]+(?=\.\d+ \()') PROJECT_VERSION=$(grep -Po '(?<=project\(PGROUTING VERSION )[^;]+' CMakeLists.txt) echo "PGVER=${PGVER}" >> $GITHUB_ENV echo "PGPORT=5432" >> $GITHUB_ENV