Merge remote-tracking branch 'upstream/master'

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

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index f1da461686f148db0a438c2f0432c6dfac962198..cbb7aa6cc0db52b46959f51a1a4755100dcf7173 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -6,11 +6,26 @@ jobs:
     tests:
         runs-on: ubuntu-20.04
 
     tests:
         runs-on: ubuntu-20.04
 

+        strategy:
+            matrix:
+                postgresql: [9.5, 13]
+                include:
+                    - postgresql: 9.5
+                      postgis: 2.5
+                    - postgresql: 13
+                      postgis: 3
+

         steps:
             - uses: actions/checkout@v2
               with:
                   submodules: true
 
         steps:
             - uses: actions/checkout@v2
               with:
                   submodules: true
 

+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '7.4'
+                  tools: phpunit, phpcs
+

             - name: Get Date
               id: get-date
               run: |
             - name: Get Date
               id: get-date
               run: |


@@ -20,11 +35,14 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - uses: actions/cache@v2
               with:
                   path: |

-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
+                     {{ github.workspace }}/data/country_osm_grid.sql.gz
+                     {{ github.workspace }}/monaco-latest.osm.pbf

                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql

+              with:
+                  postgresql-version: ${{ matrix.postgresql }}
+                  postgis-version: ${{ matrix.postgis }}

             - uses: ./.github/actions/build-nominatim
 
             - name: Install test prerequsites
             - uses: ./.github/actions/build-nominatim
 
             - name: Install test prerequsites


@@ -60,17 +78,19 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: |
             - uses: actions/cache@v2
               with:
                   path: |

-                      data/country_osm_grid.sql.gz
-                      monaco-latest.osm.pbf
+                     {{ github.workspace }}/data/country_osm_grid.sql.gz
+                     {{ github.workspace }}/monaco-latest.osm.pbf

                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql
                   key: nominatim-data-${{ steps.get-date.outputs.date }}
 
             - uses: ./.github/actions/setup-postgresql

+              with:
+                  postgresql-version: 13
+                  postgis-version: 3

             - uses: ./.github/actions/build-nominatim
 
             - name: Create configuration
               run: |
             - uses: ./.github/actions/build-nominatim
 
             - name: Create configuration
               run: |

-                   echo '<?php' > settings/local.php
-                   echo " @define('CONST_Pyosmium_Binary', '/usr/lib/python3-pyosmium/pyosmium-get-changes');" >> settings/local.php
+                   echo "NOMINATIM_PYOSMIUM_BINARY=/usr/lib/python3-pyosmium/pyosmium-get-changes" >> .env

               working-directory: build
 
             - name: Download import data
               working-directory: build
 
             - name: Download import data