action: cache downloaded dependencies

diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml
index c11b0f77b7925bf8042fdbaff561970c377dc809..9bb66df39fa2228484b9b69ad2d4209e8278db08 100644 (file)
--- a/.github/actions/build-nominatim/action.yml
+++ b/.github/actions/build-nominatim/action.yml
@@ -4,22 +4,25 @@ runs:
     using: "composite"
 
     steps:
     using: "composite"
 
     steps:

-            - name: Install prerequisits
-              run: sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium
-              shell: bash
+        - name: Install prerequisits
+          run: sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev python3-psycopg2 python3-pyosmium
+          shell: bash

 
 

-            - name: Configure
-              run: mkdir build && cd build && cmake ..
-              shell: bash
+        - name: Configure
+          run: mkdir build && cd build && cmake ..
+          shell: bash

 
 

-            - name: Build
-              run: |
-                  make -j2 all
-                  ./utils/setup.php --setup-website
-              shell: bash
-              working-directory: build
+        - name: Build
+          run: |
+              make -j2 all
+              ./utils/setup.php --setup-website
+          shell: bash
+          working-directory: build

 
 

-            - name: Download dependencies
-              run: wget -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
-              shell: bash
+        - name: Download dependencies
+          run: |
+              if [ ! -f data/country_osm_grid.sql.gz ]; then
+                  wget --no-verbose -O data/country_osm_grid.sql.gz https://www.nominatim.org/data/country_grid.sql.gz
+              fi
+          shell: bash

 
 

diff --git a/.github/actions/setup-postgresql/action.yml b/.github/actions/setup-postgresql/action.yml
index 1578504551a7fee55dccbdd03eb6f5308ff0a44f..a5716be5b445ea668b204c4f654bb85d4bc4888b 100644 (file)
--- a/.github/actions/setup-postgresql/action.yml
+++ b/.github/actions/setup-postgresql/action.yml
@@ -13,6 +13,7 @@ runs:
               echo 'fsync = off' | sudo tee /etc/postgresql/13/main/conf.d/local.conf
               echo 'synchronous_commit = off' | sudo tee -a /etc/postgresql/13/main/conf.d/local.conf
               echo 'full_page_writes = off' | sudo tee -a /etc/postgresql/13/main/conf.d/local.conf
               echo 'fsync = off' | sudo tee /etc/postgresql/13/main/conf.d/local.conf
               echo 'synchronous_commit = off' | sudo tee -a /etc/postgresql/13/main/conf.d/local.conf
               echo 'full_page_writes = off' | sudo tee -a /etc/postgresql/13/main/conf.d/local.conf

+              echo 'shared_buffers = 1GB' | sudo tee -a /etc/postgresql/13/main/conf.d/local.conf

           shell: bash
 
         - name: Setup database
           shell: bash
 
         - name: Setup database

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index 4824749c69fa5d7f4106f4312936ed21cde92814..79830673b25d68a89a001d7a42cfc37502cb0076 100644 (file)
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -11,8 +11,20 @@ jobs:
               with:
                   submodules: true
 
               with:
                   submodules: true
 

-            - uses: ./.github/actions/setup-postgresql
+            - name: Get Date
+              id: get-date
+              run: |
+                  echo "::set-output name=date::$(/bin/date -u "+%Y%W")"
+              shell: bash
+
+            - uses: actions/cache@v2
+              with:
+                  path: |
+                      data/country_osm_grid.sql.gz
+                      monaco-latest.osm.pbf
+                  key: nominatim-data-${{ steps.get-date.outputs.date }}

 
 

+            - uses: ./.github/actions/setup-postgresql

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


@@ -39,12 +51,21 @@ jobs:
               with:
                   submodules: true
 
               with:
                   submodules: true
 

-            - uses: ./.github/actions/setup-postgresql
+            - name: Get Date
+              id: get-date
+              run: |
+                  echo "::set-output name=date::$(/bin/date -u "+%Y%W")"
+              shell: bash

 
 

-            - uses: ./.github/actions/build-nominatim
+            - uses: actions/cache@v2
+              with:
+                  path: |
+                      data/country_osm_grid.sql.gz
+                      monaco-latest.osm.pbf
+                  key: nominatim-data-${{ steps.get-date.outputs.date }}

 
 

-            - name: Download test extract
-              run: wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
+            - uses: ./.github/actions/setup-postgresql
+            - uses: ./.github/actions/build-nominatim

 
             - name: Create configuration
               run: |
 
             - name: Create configuration
               run: |


@@ -52,6 +73,13 @@ jobs:
                    echo " @define('CONST_Pyosmium_Binary', '/usr/lib/python3-pyosmium/pyosmium-get-changes');" >> settings/local.php
               working-directory: build
 
                    echo " @define('CONST_Pyosmium_Binary', '/usr/lib/python3-pyosmium/pyosmium-get-changes');" >> settings/local.php
               working-directory: build
 

+            - name: Download import data
+              run: |
+                  if [ ! -f monaco-latest.osm.pbf ]; then
+                      wget --no-verbose https://download.geofabrik.de/europe/monaco-latest.osm.pbf
+                  fi
+              shell: bash
+

             - name: Import
               run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all
               working-directory: build
             - name: Import
               run: php ./utils/setup.php --osm-file ../monaco-latest.osm.pbf --osm2pgsql-cache 500 --all
               working-directory: build