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 481ec767cd088d12d3d228c50f129f23771f5359..cdc7ea1e3ec60ed41c04ce4c355e7869c3f03282 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -7,11 +7,11 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
         runs-on: ubuntu-latest
 
         steps:

-            - uses: actions/checkout@v2
+            - uses: actions/checkout@v3

               with:
                 submodules: true
 
               with:
                 submodules: true
 

-            - uses: actions/cache@v2
+            - uses: actions/cache@v3

               with:
                   path: |
                      data/country_osm_grid.sql.gz
               with:
                   path: |
                      data/country_osm_grid.sql.gz


@@ -27,7 +27,7 @@ jobs:
                   mv nominatim-src.tar.bz2 Nominatim
 
             - name: 'Upload Artifact'
                   mv nominatim-src.tar.bz2 Nominatim
 
             - name: 'Upload Artifact'

-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v3

               with:
                   name: full-source
                   path: nominatim-src.tar.bz2
               with:
                   name: full-source
                   path: nominatim-src.tar.bz2


@@ -50,7 +50,7 @@ jobs:
                       pytest: py.test-3
                       php: 7.4
                     - ubuntu: 22
                       pytest: py.test-3
                       php: 7.4
                     - ubuntu: 22

-                      postgresql: 14
+                      postgresql: 15

                       postgis: 3
                       pytest: py.test-3
                       php: 8.1
                       postgis: 3
                       pytest: py.test-3
                       php: 8.1


@@ -58,7 +58,7 @@ jobs:
         runs-on: ubuntu-${{ matrix.ubuntu }}.04
 
         steps:
         runs-on: ubuntu-${{ matrix.ubuntu }}.04
 
         steps:

-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v3

               with:
                   name: full-source
 
               with:
                   name: full-source
 


@@ -72,7 +72,7 @@ jobs:
                   tools: phpunit, phpcs, composer
                   ini-values: opcache.jit=disable
 
                   tools: phpunit, phpcs, composer
                   ini-values: opcache.jit=disable
 

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

               with:
                 python-version: 3.6
               if: matrix.ubuntu == 18
               with:
                 python-version: 3.6
               if: matrix.ubuntu == 18


@@ -99,7 +99,7 @@ jobs:
               if: matrix.ubuntu == 22
 
             - name: Install latest pylint/mypy
               if: matrix.ubuntu == 22
 
             - name: Install latest pylint/mypy

-              run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil typing-extensions
+              run: pip3 install -U pylint mypy types-PyYAML types-jinja2 types-psycopg2 types-psutil types-requests typing-extensions

 
             - name: PHP linting
               run: phpcs --report-width=120 .
 
             - name: PHP linting
               run: phpcs --report-width=120 .


@@ -136,7 +136,7 @@ jobs:
         runs-on: ubuntu-20.04
 
         steps:
         runs-on: ubuntu-20.04
 
         steps:

-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v3

               with:
                   name: full-source
 
               with:
                   name: full-source
 


@@ -231,7 +231,7 @@ jobs:
                 OS: ${{ matrix.name }}
                 INSTALL_MODE: ${{ matrix.install_mode }}
 
                 OS: ${{ matrix.name }}
                 INSTALL_MODE: ${{ matrix.install_mode }}
 

-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v3

               with:
                   name: full-source
                   path: /home/nominatim
               with:
                   name: full-source
                   path: /home/nominatim


@@ -265,6 +265,10 @@ jobs:
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 
               run: nominatim --version
               working-directory: /home/nominatim/nominatim-project
 

+            - name: Collect host OS information
+              run: nominatim admin --collect-os-info
+              working-directory: /home/nominatim/nominatim-project
+              

             - name: Import
               run: nominatim import --osm-file ../test.pbf
               working-directory: /home/nominatim/nominatim-project
             - name: Import
               run: nominatim import --osm-file ../test.pbf
               working-directory: /home/nominatim/nominatim-project