optimized events
Test and publish container images / test (push) Successful in 2m26s
Test and publish container images / publish (push) Failing after 3s

This commit is contained in:
BuTzZ
2026-07-28 14:36:47 +02:00
parent b98ec8bc6f
commit 593dbd5f85
42 changed files with 2405 additions and 283 deletions
@@ -71,4 +71,56 @@ if wm_route_data_ready; then
exit 1
fi
printf 'Routingdaten- und Markerprüfungen: OK\n'
mkdir -p "$WATERMAPS_DATA_DIR/geofabrik"
printf '%s germany-latest.osm.pbf\n' \
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' \
>"$WATERMAPS_DATA_DIR/geofabrik/germany-latest.osm.pbf.md5"
printf '%s netherlands-latest.osm.pbf\n' \
'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' \
>"$WATERMAPS_DATA_DIR/geofabrik/netherlands-latest.osm.pbf.md5"
cat >"$(wm_marine_marker)" <<'MARKER'
format_version=1
generated_at=2026-07-28T00:00:00Z
source=germany+netherlands
germany_md5=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
netherlands_md5=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
total_osm_features=100
harbour_count=10
lock_count=5
bridge_count=20
MARKER
wm_postgres_query() {
printf '100|10|5|20\n'
}
wm_marine_features_ready
wm_postgres_query() {
printf '100|10|0|20\n'
}
if wm_marine_features_ready; then
printf 'Marine-Feature-Marker wurde trotz fehlender Schleusen akzeptiert.\n' >&2
exit 1
fi
wm_postgres_query() {
printf '99|10|5|20\n'
}
if wm_marine_features_ready; then
printf 'Marine-Feature-Marker wurde trotz abweichendem Datenbankbestand akzeptiert.\n' >&2
exit 1
fi
if grep -Eq 'DATABASE_URL:[[:space:]]*""' \
"$ROOT_DIR/docker-compose.yml" \
"$ROOT_DIR/deploy/compose.production.yml"; then
printf 'Compose trennt die App weiterhin explizit von PostGIS.\n' >&2
exit 1
fi
grep -Fq 'condition: service_healthy' "$ROOT_DIR/deploy/compose.production.yml"
grep -Fq '/ready' "$ROOT_DIR/deploy/compose.production.yml"
grep -Fq 'source: ${WATERMAPS_DATA_DIR:-/srv/watermaps-data}/postgres' \
"$ROOT_DIR/deploy/compose.production.yml"
printf 'Routingdaten-, Marine-Feature- und Compose-Prüfungen: OK\n'
@@ -16,6 +16,7 @@ mkdir -p "$FAKE_BIN" "$DATA_DIR/local" "$RUNTIME_DIR"
cat >"$ENV_FILE" <<EOF
WATERMAPS_DATA_DIR=$DATA_DIR
WATERMAPS_RUNTIME_DIR=$RUNTIME_DIR
WATERMAPS_POSTGRES_PASSWORD=0123456789abcdef0123456789abcdef
EOF
cat >"$IMAGES_ENV_FILE" <<'EOF'
@@ -48,6 +49,11 @@ if [[ "${1:-}" == "inspect" ]]; then
fi
arguments=" $* "
if [[ "$arguments" == *" ps --quiet postgres "* ]]; then
printf 'postgres-test-container\n'
exit 0
fi
if [[ "$arguments" == *" ps --quiet watermaps "* ]]; then
printf 'watermaps-test-container\n'
exit 0
@@ -55,6 +61,13 @@ fi
if [[ "$arguments" == *" run "*" route-data "* ||
"$arguments" == *" run "*" route-data" ]]; then
mkdir -p "$WATERMAPS_DATA_DIR/geofabrik"
printf '%s germany-latest.osm.pbf\n' \
'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' \
>"$WATERMAPS_DATA_DIR/geofabrik/germany-latest.osm.pbf.md5"
printf '%s netherlands-latest.osm.pbf\n' \
'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' \
>"$WATERMAPS_DATA_DIR/geofabrik/netherlands-latest.osm.pbf.md5"
route_file="$WATERMAPS_DATA_DIR/local/.germany-netherlands-fairways.candidate.json"
marker_file="$WATERMAPS_DATA_DIR/local/.germany-netherlands-fairways.candidate.ready"
cat >"$route_file" <<JSON
@@ -86,6 +99,27 @@ JSON
exit 0
fi
if [[ "$arguments" == *" run "*" marine-data "* ||
"$arguments" == *" run "*" marine-data" ]]; then
cat >"$WATERMAPS_DATA_DIR/local/.marine-features.ready" <<'MARKER'
format_version=1
generated_at=2026-07-28T00:00:00Z
source=germany+netherlands
germany_md5=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
netherlands_md5=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
total_osm_features=100
harbour_count=10
lock_count=5
bridge_count=20
MARKER
exit 0
fi
if [[ "$arguments" == *" exec --no-TTY postgres "* ]]; then
printf '100|10|5|20\n'
exit 0
fi
if [[ "$arguments" == *" exec --no-TTY watermaps "* ]]; then
active_file="$WATERMAPS_DATA_DIR/local/germany-netherlands-fairways.json"
active_revision="$(jq --raw-output '.revision // 0' "$active_file" 2>/dev/null || true)"