Merge pull request #3493 from lonvia/clean-up-bdd-tests

[nominatim.git] / .github / workflows / ci-tests.yml

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index c8337ebc93ec6211220f8f96d633551ac6bd1d96..1cfaf616818a8b3d3151d4f57199bf752c046c64 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -65,7 +65,7 @@ jobs:
             - name: Unpack Nominatim
               run: tar xf nominatim-src.tar.bz2
 
             - name: Unpack Nominatim
               run: tar xf nominatim-src.tar.bz2
 

-            - uses: actions/setup-python@v4
+            - uses: actions/setup-python@v5

               with:
                 python-version: 3.7
               if: matrix.flavour == 'oldstuff'
               with:
                 python-version: 3.7
               if: matrix.flavour == 'oldstuff'


@@ -80,15 +80,15 @@ jobs:
                   flavour: ${{ matrix.flavour }}
                   lua: ${{ matrix.lua }}
 
                   flavour: ${{ matrix.flavour }}
                   lua: ${{ matrix.lua }}
 

-            - name: Install test prerequsites (behave from apt)
+            - name: Install test prerequisites (behave from apt)

               run: sudo apt-get install -y -qq python3-behave
               if: matrix.flavour == 'ubuntu-20'
 
               run: sudo apt-get install -y -qq python3-behave
               if: matrix.flavour == 'ubuntu-20'
 

-            - name: Install test prerequsites (behave from pip)
+            - name: Install test prerequisites (behave from pip)

               run: pip3 install behave==1.2.6
               if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 
               run: pip3 install behave==1.2.6
               if: (matrix.flavour == 'oldstuff') || (matrix.flavour == 'ubuntu-22')
 

-            - name: Install test prerequsites (from apt for Ununtu 2x)
+            - name: Install test prerequisites (from apt for Ununtu 2x)

               run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn
               if: matrix.flavour != 'oldstuff'
 
               run: sudo apt-get install -y -qq python3-pytest python3-pytest-asyncio uvicorn
               if: matrix.flavour != 'oldstuff'
 


@@ -96,7 +96,7 @@ jobs:
               run: pip3 install -U pytest-asyncio
               if: matrix.flavour == 'ubuntu-20'
 
               run: pip3 install -U pytest-asyncio
               if: matrix.flavour == 'ubuntu-20'
 

-            - name: Install test prerequsites (from pip for Ubuntu 18)
+            - name: Install test prerequisites (from pip for Ubuntu 18)

               run: pip3 install pytest pytest-asyncio uvicorn
               if: matrix.flavour == 'oldstuff'
 
               run: pip3 install pytest pytest-asyncio uvicorn
               if: matrix.flavour == 'oldstuff'
 


@@ -118,7 +118,8 @@ jobs:
 
             - name: BDD tests
               run: |
 
             - name: BDD tests
               run: |

-                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build --format=progress3
+                  export PATH=$GITHUB_WORKSPACE/build/osm2pgsql:$PATH
+                  python3 -m behave -DREMOVE_TEMPLATE=1 --format=progress3

               working-directory: Nominatim/test/bdd
 
             - name: Install mypy and typechecking info
               working-directory: Nominatim/test/bdd
 
             - name: Install mypy and typechecking info


@@ -165,12 +166,13 @@ jobs:
               with:
                   cmake-args: -DBUILD_MODULE=on
 
               with:
                   cmake-args: -DBUILD_MODULE=on
 

-            - name: Install test prerequsites
+            - name: Install test prerequisites

               run: sudo apt-get install -y -qq python3-behave
 
             - name: BDD tests (legacy tokenizer)
               run: |
               run: sudo apt-get install -y -qq python3-behave
 
             - name: BDD tests (legacy tokenizer)
               run: |

-                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=php -DTOKENIZER=legacy --format=progress3
+                  export PATH=$GITHUB_WORKSPACE/build/osm2pgsql:$PATH
+                  python3 -m behave -DREMOVE_TEMPLATE=1 -DSERVER_MODULE_PATH=$GITHUB_WORKSPACE/build/module -DAPI_ENGINE=php -DTOKENIZER=legacy --format=progress3

               working-directory: Nominatim/test/bdd
 
 
               working-directory: Nominatim/test/bdd
 
 


@@ -212,12 +214,13 @@ jobs:
               with:
                   flavour: 'ubuntu-22'
 
               with:
                   flavour: 'ubuntu-22'
 

-            - name: Install test prerequsites
+            - name: Install test prerequisites

               run: sudo apt-get install -y -qq python3-behave
 
             - name: BDD tests (php)
               run: |
               run: sudo apt-get install -y -qq python3-behave
 
             - name: BDD tests (php)
               run: |

-                  python3 -m behave -DREMOVE_TEMPLATE=1 -DBUILDDIR=$GITHUB_WORKSPACE/build -DAPI_ENGINE=php --format=progress3
+                  export PATH=$GITHUB_WORKSPACE/build/osm2pgsql:$PATH
+                  python3 -m behave -DREMOVE_TEMPLATE=1 -DAPI_ENGINE=php --format=progress3

               working-directory: Nominatim/test/bdd
 
 
               working-directory: Nominatim/test/bdd