diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 934ba5d..bdfff17 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ stages: - conflate - candidate - upload + - pages docker prepare: image: docker:latest @@ -96,8 +97,8 @@ prepare: before_script: - b2 authorize-account $B2_KEYID $B2_APPKEY - mkdir -p dist data - - b2 sync --allowEmptySource --noProgress --delete dist b2://vicmap2osm/dist - - b2 sync --allowEmptySource --noProgress --delete data b2://vicmap2osm/data + - b2 sync --threads 4 --allowEmptySource --noProgress --delete dist b2://vicmap2osm/dist + - b2 sync --threads 4 --allowEmptySource --noProgress --delete data b2://vicmap2osm/data cache: <<: *global_cache policy: push @@ -105,7 +106,7 @@ prepare: - yarn install - cp src/polygon-lookup-patch.js node_modules/polygon-lookup/index.js - mkdir -p dist - - make data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VICMAP_ADDRESS.gdb + - make data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VMADD.gdb - rm -rf data/vicmap.geojson data/VICMAP_ADDRESS.zip - make data/vicmap.geojson after_script: @@ -120,7 +121,7 @@ build osm: - mkdir -p data dist - ls data dist - b2 authorize-account $B2_KEYID $B2_APPKEY - - b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ . + - b2 sync --threads 4 --allowEmptySource --noProgress b2://vicmap2osm/ . cache: <<: *global_cache policy: pull-push @@ -141,8 +142,8 @@ build osm: dependencies: - prepare after_script: - - b2 sync --allowEmptySource --noProgress data b2://vicmap2osm/data - - b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist + - b2 sync --threads 4 --allowEmptySource --noProgress data b2://vicmap2osm/data + - b2 sync --threads 4 --allowEmptySource --noProgress dist b2://vicmap2osm/dist build vicmap: stage: build vicmap @@ -151,7 +152,7 @@ build vicmap: - mkdir -p data dist - ls data dist - b2 authorize-account $B2_KEYID $B2_APPKEY - - b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ . + - b2 sync --threads 4 --allowEmptySource --noProgress b2://vicmap2osm/ . cache: <<: *global_cache policy: pull-push @@ -162,7 +163,7 @@ build vicmap: - 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 data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VMADD.gdb - touch --no-create data/vicmap.geojson - time make dist/vicmap-osm-with-suburb.geojson - time make dist/vicmap-osm-uniq.geojson @@ -175,8 +176,8 @@ build vicmap: dependencies: - build osm after_script: - - b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist - - b2 sync --allowEmptySource --noProgress debug b2://vicmap2osm/debug + - b2 sync --threads 4 --allowEmptySource --noProgress dist b2://vicmap2osm/dist + - b2 sync --threads 4 --allowEmptySource --noProgress debug b2://vicmap2osm/debug conflate: stage: conflate @@ -185,7 +186,7 @@ conflate: - mkdir -p data dist - ls data dist - b2 authorize-account $B2_KEYID $B2_APPKEY - - b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ . + - b2 sync --threads 4 --allowEmptySource --noProgress b2://vicmap2osm/ . cache: <<: *global_cache policy: pull @@ -203,8 +204,8 @@ conflate: - build vicmap - build osm after_script: - - b2 sync --allowEmptySource --noProgress data b2://vicmap2osm/data - - b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist + - b2 sync --threads 4 --allowEmptySource --noProgress data b2://vicmap2osm/data + - b2 sync --threads 4 --allowEmptySource --noProgress dist b2://vicmap2osm/dist candidate: stage: candidate @@ -213,7 +214,7 @@ candidate: - mkdir -p data dist - ls data dist - b2 authorize-account $B2_KEYID $B2_APPKEY - - b2 sync --allowEmptySource --noProgress b2://vicmap2osm/ . + - b2 sync --threads 4 --allowEmptySource --noProgress b2://vicmap2osm/ . cache: <<: *global_cache policy: pull @@ -226,7 +227,7 @@ candidate: dependencies: - conflate after_script: - - b2 sync --allowEmptySource --noProgress dist b2://vicmap2osm/dist + - b2 sync --threads 4 --allowEmptySource --noProgress dist b2://vicmap2osm/dist upload dev: stage: upload @@ -265,7 +266,7 @@ build compareSuburb: - 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 data/vicmap/ll_gda2020/filegdb/whole_of_dataset/victoria/VMADD.gdb - touch --no-create data/vicmap.geojson - time make dist/vicmap-osm-with-suburb.geojson - time make dist/vicmapSuburbDiffersWithOSM.geojson @@ -275,3 +276,15 @@ build compareSuburb: needs: ['prepare'] dependencies: - prepare + +pages: + stage: pages + script: + - cp -r www public + - cp dist/conflate/*.changes.json public/data/ + artifacts: + paths: + - public + needs: ['conflate'] + dependencies: + - conflate |