Commit graph

119 commits

Author SHA1 Message Date
Hugh Rundle 1d8d1b6f5c whoops wrong username 2021-01-29 15:07:52 +11:00
Hugh Rundle bb9429a22a fix syntax 2021-01-29 15:02:16 +11:00
Hugh Rundle 8ccb417653 add automerge workflow 2021-01-29 14:59:50 +11:00
Hugh Rundle 252e21815d
Merge pull request #62 from hughrun/geo-to-topo
Update TopoJSON boundaries
2021-01-29 10:53:33 +11:00
hughrun c3b5bf948f Update TopoJSON boundaries 2021-01-28 23:39:22 +00:00
Hugh Rundle 593454cd6e
Update minify-map-json.yml
whoops missed a comma
2021-01-29 10:38:23 +11:00
Hugh Rundle 6aa7624932
Update minify-map-json.yml
use if statement syntax from https://github.com/marketplace/actions/skip-based-on-commit-message
2021-01-29 10:36:44 +11:00
Hugh Rundle 77d005c73c
Merge pull request #61 from hughrun/actions
change login in Actions filter
2021-01-29 10:30:08 +11:00
Hugh Rundle 80ae2d6ba7 Merge branch 'actions' of github.com:hughrun/public_library_map into actions
align remote and local branches
2021-01-29 10:26:46 +11:00
Hugh Rundle ebddda6882 change logic on if filter 2021-01-29 10:25:56 +11:00
Hugh Rundle c7b26953cf
Merge pull request #59 from hughrun/geo-to-topo
Update TopoJSON boundaries
2021-01-29 10:00:48 +11:00
hughrun 6f909a1383 Update TopoJSON boundaries 2021-01-28 22:57:20 +00:00
Hugh Rundle f54d2a3830
Merge pull request #58 from hughrun/actions
Fixes Actions?
2021-01-29 09:55:28 +11:00
Hugh Rundle 88cfcaf913 add condition to Action
The minify-map-json action is causing itself to run every time its PRs are merged.
This hopefully will stop that happening, but ignoring anything with an 'automated' label and then applying that label when pushing the PR
2021-01-29 09:50:15 +11:00
Hugh Rundle cc885cfc36 add labels to actions 2021-01-29 09:18:07 +11:00
Hugh Rundle 5f0dc6d291
Merge pull request #56 from hughrun/geo-to-topo
Update TopoJSON boundaries
2021-01-29 08:44:06 +11:00
hughrun 140ee273b3 Update TopoJSON boundaries 2021-01-28 21:38:43 +00:00
Hugh Rundle d2fe80e0c8
Merge pull request #55 from hughrun/testing
fix Actions 🤞🏼
2021-01-29 08:36:24 +11:00
Hugh Rundle 92ad548b92 fix Action workflows
- fix incorrect key name in merge file (json_data['objects']['boundaries.geo'] rather than json_data['objects']['boundaries'])
- don't merge csv and topo.json when topo.json changes, as this will create an infinite loop
- run merge as part of geo-to-topo Action, after new topo file is created
- remove redundant shell file
2021-01-29 08:28:40 +11:00
hughrun f22901f869 Update TopoJSON boundaries 2021-01-28 21:04:12 +00:00
Hugh Rundle ad3cbc2eb1
Merge pull request #53 from hughrun/geo-to-topo
Update TopoJSON boundaries
2021-01-29 08:03:20 +11:00
hughrun 99dbfa96a4 Update TopoJSON boundaries 2021-01-28 10:13:17 +00:00
Hugh Rundle b2b14aa49f
Update merge-csv-to-topojson.yml
add `website/data/boundaries.topo.json`
2021-01-28 21:11:40 +11:00
Hugh Rundle cb08f5b834
Update minify-map-json.yml
simplify workflow
2021-01-28 21:05:11 +11:00
Hugh Rundle 0ba15f523f
Merge pull request #52 from hughrun/geo2topo
update worklow
2021-01-28 20:50:18 +11:00
Hugh Rundle 81e2ae533a
Merge branch 'master' into geo2topo 2021-01-28 20:50:08 +11:00
Hugh Rundle bc3bcdab47 update worklow 2021-01-28 20:44:56 +11:00
Hugh Rundle 1733b0d413
Update minify-map-json.yml
add `uses`
2021-01-28 20:16:39 +11:00
Hugh Rundle 587d443a58
Update minify-map-json.yml
adjust filepaths
2021-01-28 20:08:28 +11:00
Hugh Rundle 01246f5964
Update minify-map-json.yml
clean up
2021-01-28 19:56:57 +11:00
Hugh Rundle 2607f527de
Merge pull request #51 from hughrun/geo2topo
reconfigure minify-map-json action
2021-01-28 19:15:37 +11:00
Hugh Rundle 12ef934e6c reconfigure minify-map-json action
- update yml by bringing shell script into the main action yml
- add shebang to shell script file in case this doesn't work and we need it still
2021-01-28 19:11:21 +11:00
Hugh Rundle c1de272d3e
Merge pull request #50 from hughrun/geo2topo
update github action
2021-01-28 18:59:59 +11:00
Hugh Rundle 67f63d9202 update github action
- apparently it needs sudo with no password to npm install?
- also added ability to run the json update action manually
2021-01-28 18:57:43 +11:00
Hugh Rundle a88ad08ca9
Merge pull request #49 from hughrun/geo2topo
update geojson
2021-01-28 18:51:26 +11:00
Hugh Rundle 092f9d1440 update geojson
just to trigger the action really, it should be more or less the same
2021-01-28 18:49:13 +11:00
Hugh Rundle 0e2835c897
Merge pull request #48 from hughrun/geo2topo
fix filepath in action
2021-01-28 18:44:40 +11:00
Hugh Rundle ffdd84f240 fix filepath in action 2021-01-28 18:42:47 +11:00
Hugh Rundle fb209b565a
Merge pull request #47 from hughrun/geo2topo
add geojson file
2021-01-28 18:35:07 +11:00
Hugh Rundle 35130b175a add geojson file
This is the mother geojson file with all the boundaries. It should be processed into topojson automatically on any pushed changes. Let's find out!
2021-01-28 18:31:43 +11:00
Hugh Rundle e8163c68b2
Merge pull request #46 from hughrun/geo2topo
Geo2topo
2021-01-28 18:29:40 +11:00
Hugh Rundle f55bcd97f9 clarify path for GH Action 2021-01-28 18:26:31 +11:00
Hugh Rundle 12997c2eb4 add csv-to-topo to geo-t-topo
We need to merge the csv data into the new topojson file!
2021-01-28 18:25:11 +11:00
Hugh Rundle 4e2851fb1d add GitHub action
Processes geojson to topojson on a change to the geojson file.
2021-01-28 18:15:47 +11:00
Hugh Rundle 8599e4be0d
Merge pull request #45 from hughrun/contributing
update contributing pages
2021-01-28 10:05:15 +11:00
Hugh Rundle d2e3fc77ff update contributing pages
fixes #44 - make it clearer which issues to look at
2021-01-28 09:59:27 +11:00
Hugh Rundle 6b35971d8e
Merge pull request #40 from hughrun/update-docs
update docs
2021-01-26 18:44:55 +11:00
Hugh Rundle a36463cb3b update docs
Now that that the merging GitHub Action is working, the docs need to be updated in regard to the geojson and topojson files. Also cleans up where this info is located, as it was in 'about' but should be in 'contributing'.
2021-01-26 18:42:37 +11:00
Hugh Rundle a40bd76192
Merge pull request #38 from hughrun/auto-update-topo
Update TopoJSON
2021-01-26 17:48:36 +11:00
hughrun ec0ce5bf4c update TopoJSON 2021-01-26 06:40:27 +00:00