aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Harvey <andrew@alantgeo.com.au>2022-05-24 14:02:55 +1000
committerAndrew Harvey <andrew@alantgeo.com.au>2022-05-24 14:02:55 +1000
commit8b211ac171958ec5c84f9549eb0a5a0006cdb764 (patch)
tree7b7405b600bf6740c5a4c39f0a2ee72cc8ac5605
parente6ace15235b45c21b7165a884db762ac170c1f85 (diff)
build vicmap needs some outputs from build osm
-rw-r--r--.gitlab-ci.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4795b75..6928b2c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,8 @@ cache: &global_cache
stages:
- docker
- prepare
- - build
+ - build osm
+ - build vicmap
- conflate
- candidate
- upload
@@ -110,7 +111,7 @@ prepare:
when: manual
build vicmap:
- stage: build
+ stage: build vicmap
image: "registry.gitlab.com/alantgeo/vicmap2osm:build-vicmap"
before_script:
- mkdir -p data dist
@@ -142,7 +143,7 @@ build vicmap:
- b2 sync --allowEmptySource --noProgress debug b2://vicmap2osm/debug
build osm:
- stage: build
+ stage: build osm
image: "registry.gitlab.com/alantgeo/vicmap2osm:build-osm"
before_script:
- mkdir -p data dist
@@ -167,6 +168,7 @@ build osm:
- make summariseBlocksByOSMAddr
when: manual
after_script:
+ - b2 sync --allowEmptySource --noProgress data b2://vicmap2osm/data
- b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist
conflate:
@@ -235,7 +237,7 @@ upload dev:
- uploadLog
build compareSuburb:
- stage: build
+ stage: build vicmap
image: "registry.gitlab.com/alantgeo/vicmap2osm:build-osm"
before_script:
- mkdir -p data dist