Skip to content

Commit 5d565f7

Browse files
committed
ci: Try ci fix
1 parent 800ba0e commit 5d565f7

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/robot-framework.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ jobs:
7777
7878
- name: Start Postgres
7979
uses: ./.github/actions/start-postgres/
80-
with:
81-
wait-started: false
82-
prepare-only: true
8380

8481
- name: Install PostGis data
8582
uses: ./.github/actions/install-postgis-data/

docker-compose.local.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ x-variables: &variables
44
environment:
55
TIMEZONE: "UTC"
66
GK_IS_UNIT_TESTING: "true"
7-
# GK_WEBSITE_HOST must me the stack internal way off accessing the website
7+
# GK_WEBSITE_HOST must be the stack internal way off accessing the website
88
GK_WEBSITE_HOST: nginx
99
# GK_WEBSITE_FQDN How the webiste is reached externally
1010
GK_WEBSITE_FQDN: "${GK_FQDN:-localhost}"
@@ -112,7 +112,7 @@ services:
112112
volumes:
113113
- /etc/localtime:/etc/localtime:ro
114114
- ./website/db/dumps/:/docker-entrypoint-initdb.d/
115-
- ./website/db/srtm/:/srtm/
115+
- ./website/db/srtm/:/srv/srtm/
116116
tmpfs:
117117
- /var/lib/postgresql/data
118118
ports:
@@ -122,7 +122,7 @@ services:
122122
POSTGRES_DB: "geokrety"
123123
POSTGRES_USER: "geokrety"
124124
POSTGRES_PASSWORD: "geokrety"
125-
# POSTGIS_ENABLE_OUTDB_RASTERS: 1
125+
POSTGIS_ENABLE_OUTDB_RASTERS: 1
126126
POSTGIS_GDAL_ENABLED_DRIVERS: ENABLE_ALL
127127

128128
redis:

website/db/tests-srtm-import.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ cleanup() {
1515
mkdir "$SRTM_DIR" || true
1616

1717
echo "Getting SRTM Files…"
18-
wget -4 -c -i "$DIR/tests-srtm-import.txt" -P "$SRTM_DIR"
18+
wget -4 -xnH -c -i "$DIR/tests-srtm-import.txt" -P "$SRTM_DIR"
1919

2020
echo "Generating SQL import file"
2121
# Ensure the postgis function are found from the public schema
2222
echo "SET search_path = public;" > "$QUERIES_FILE"
23-
raster2pgsql "$SRTM_DIR"/*.zip -F -I -e public.srtm >> "$QUERIES_FILE"
23+
raster2pgsql "$SRTM_DIR"/*/*.zip -F -I -e public.srtm >> "$QUERIES_FILE"
2424

2525
echo "Importing SQL import file…"
2626
psql -h 127.0.0.1 -U "${PGUSER:-geokrety}" "${DBNAME:-geokrety}" -f "$QUERIES_FILE"

0 commit comments

Comments
 (0)