dependencies

1 files changed, 30 insertions, 28 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ccdcad9..7556a4b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,31 +117,28 @@ prepare:
       - data
 
 
-build vicmap:
-  stage: build vicmap
-  image: "registry.gitlab.com/alantgeo/vicmap2osm:build-vicmap"
+build osm:
+  stage: build osm
+  image: "registry.gitlab.com/alantgeo/vicmap2osm:build-osm"
   before_script:
     - mkdir -p data dist
     - ls data dist
   cache:
     <<: *global_cache
     policy: pull-push
+  variables:
+    QT_QPA_PLATFORM: "offscreen"
   script:
     - yarn install
     - cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
-    - yarn run test
     - mkdir -p dist data
-    - mkdir -p data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria
-    - touch data/VICMAP_ADDRESS.zip
-    - touch data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VICMAP_ADDRESS.gdb
-    - touch --no-create data/vicmap.geojson
-    - time make dist/vicmap-osm-with-suburb.geojson
-    - time make dist/vicmap-osm-uniq.geojson
-    - time make dist/vicmap-osm-uniq-flats.geojson
-    - time make dist/vicmap-osm-uniq-flats-withinrange.geojson
-    - time make dist/vicmap-osm-overlapping.geojson
-    - time make convertGeoJSONResultsToFGB
-    - wc -l dist/*.geojson
+    - make data/victoria-named-features.osm.geojson
+    - make data/victoria-addr.osm.fgb
+    - make data/victoria-addr.osm.centroids.fgb
+    - make data/blocks.fgb
+    - make dist/blocksByOSMAddr.geojson
+    - make data/victoria-admin-level9.osm.geojson
+    - make summariseBlocksByOSMAddr
   dependencies:
     - prepare
   artifacts:
@@ -151,30 +148,34 @@ build vicmap:
       - debug
       - data
 
-build osm:
-  stage: build osm
-  image: "registry.gitlab.com/alantgeo/vicmap2osm:build-osm"
+
+build vicmap:
+  stage: build vicmap
+  image: "registry.gitlab.com/alantgeo/vicmap2osm:build-vicmap"
   before_script:
     - mkdir -p data dist
     - ls data dist
   cache:
     <<: *global_cache
     policy: pull-push
-  variables:
-    QT_QPA_PLATFORM: "offscreen"
   script:
     - yarn install
     - cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js
+    - yarn run test
     - mkdir -p dist data
-    - make data/victoria-named-features.osm.geojson
-    - make data/victoria-addr.osm.fgb
-    - make data/victoria-addr.osm.centroids.fgb
-    - make data/blocks.fgb
-    - make dist/blocksByOSMAddr.geojson
-    - make data/victoria-admin-level9.osm.geojson
-    - make summariseBlocksByOSMAddr
+    - mkdir -p data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria
+    - touch data/VICMAP_ADDRESS.zip
+    - touch data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VICMAP_ADDRESS.gdb
+    - touch --no-create data/vicmap.geojson
+    - time make dist/vicmap-osm-with-suburb.geojson
+    - time make dist/vicmap-osm-uniq.geojson
+    - time make dist/vicmap-osm-uniq-flats.geojson
+    - time make dist/vicmap-osm-uniq-flats-withinrange.geojson
+    - time make dist/vicmap-osm-overlapping.geojson
+    - time make convertGeoJSONResultsToFGB
+    - wc -l dist/*.geojson
   dependencies:
-    - build vicmap
+    - build osm
   artifacts:
     name: "vicmap2osm"
     paths:
@@ -182,6 +183,7 @@ build osm:
       - debug
       - data
 
+
 conflate:
   stage: conflate
   image: "registry.gitlab.com/alantgeo/vicmap2osm:conflate"