From 4147e043198af432938c1835cbd6df1fac520512 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Wed, 28 Oct 2020 11:54:37 +0100 Subject: [PATCH] action: cache downloaded dependencies --- .github/actions/build-nominatim/action.yml | 33 ++++++++++-------- .github/actions/setup-postgresql/action.yml | 1 + .github/workflows/ci-tests.yml | 38 ++++++++++++++++++--- 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml index c11b0f77..9bb66df3 100644 --- a/.github/actions/build-nominatim/action.yml +++ b/.github/actions/build-nominatim/action.yml @@ -4,22 +4,25 @@ runs: 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 15785045..a5716be5 100644 --- 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 'shared_buffers = 1GB' | sudo tee -a /etc/postgresql/13/main/conf.d/local.conf shell: bash - name: Setup database diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4824749c..79830673 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -11,8 +11,20 @@ jobs: 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 @@ -39,12 +51,21 @@ jobs: 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: | @@ -52,6 +73,13 @@ jobs: 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 -- 2.45.1