(CI) Adjusting workflows including ubuntu-22.04

pgRouting · Oct 10, 2024 · 48f3d85 · 48f3d85
1 parent 9f2ec2b
commit 48f3d85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/boost_version.yml b/.github/workflows/boost_version.yml
@@ -95,11 +95,6 @@ jobs:
           sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ \
             $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
 
-      - name: Install python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.x'
-
       - name: Install dependencies
         run: |
           sudo apt-get update
@@ -111,8 +106,6 @@ jobs:
             postgresql-${PGVER}-postgis-${PGIS}-scripts \
             postgresql-server-dev-${PGVER}
 
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
           wget https://sourceforge.net/projects/boost/files/boost/1.${{ matrix.boost_minor }}.0/boost_1_${{ matrix.boost_minor }}_0.tar.bz2
           #wget https://dl.bintray.com/boostorg/release/1.${{ matrix.boost_minor }}.0/source/boost_1_${{ matrix.boost_minor }}_0.tar.bz2
           sudo tar --bzip2 -xf  boost_1_${{ matrix.boost_minor }}_0.tar.bz2
@@ -124,7 +117,7 @@ jobs:
           export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
           mkdir build
           cd build
-          cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug -DWITH_DOC=OFF ..
+          cmake -DPOSTGRESQL_VERSION=${PGVER} -DCMAKE_BUILD_TYPE=Debug ..
 
       - name: Build
         run: |

diff --git a/.github/workflows/check-queries.yml b/.github/workflows/check-queries.yml
@@ -111,7 +111,10 @@ jobs:
       - name: Test documentation queries are up to date
         run: |
           sudo -u postgres createdb -p ${PGPORT}  pgr_test__db__test
-          TESTDIRS="version"
+          # queries that might change
+          # version: will catch the current version
+          # mincut: results change depending on boost
+          TESTDIRS="version mincut"
           for d in ${TESTDIRS}
           do
             ./tools/testers/doc_queries_generator.pl -pgver "${PGVER}" -pguser runner -documentation -alg "docqueries/${d}"

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -29,9 +29,9 @@ jobs:
     strategy:
         fail-fast: false
         matrix:
-          psql: [12,13,14,15,16]
+          psql: [13,14,15,16]
           postgis: [3]
-          os: [ubuntu-latest, ubuntu-20.04]
+          os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04]
 
     steps:
       - uses: actions/checkout@v4