From d5c8ecd027a448a19b1af1003760d8bfb856c36c Mon Sep 17 00:00:00 2001 From: Andrew Harvey Date: Mon, 3 May 2021 21:24:16 +1000 Subject: use touch to ensure make dependencies work as intended to avoid attempting to perform parent tasks --- .gitlab-ci.yml | 3 ++- Makefile | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 776458e..c4e5eb4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,8 @@ build: - yarn install - node test/index.js - mkdir -p dist - - make --assume-old=data/vicmap.geojson dist/vicmap-osm.geojson + - touch --no-create data/vicmap.geojson + - make dist/vicmap-osm.geojson - make dist/vicmap-osm-flats.geojson artifacts: name: "build" diff --git a/Makefile b/Makefile index 9c3aabb..2a723e4 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,13 @@ data/VICMAP_PROPERTY.zip: data/vicmap/ll_gda94/sde_shape/whole/VIC/VMADD/layer/address.shp: data/VICMAP_ADDRESS.zip mkdir -p data/vicmap unzip -d data/vicmap -n $< + # update mtime so that Make doesn't see it as outdated + touch --no-create $@ data/vicmap/ll_gda94/sde_shape/whole/VIC/VMPROP/layer/property_view.shp: data/VICMAP_PROPERTY.zip mkdir -p data/vicmap unzip -d data/vicmap -n $< + touch --no-create $@ data/vicmap-property.fgb: data/vicmap/ll_gda94/sde_shape/whole/VIC/VMPROP/layer/property_view.shp ogr2ogr -f FlatGeobuf -nlt PROMOTE_TO_MULTI $@ $< -- cgit v1.2.3