Hugh Rundle
5a51ad2cb1
Merge pull request #68 from hughrun/a-hills
...
update Adelaide Hills website
2021-01-29 16:08:58 +11:00
Hugh Rundle
cee45c3370
Merge pull request #70 from hughrun/actions
...
Actions
2021-01-29 16:06:56 +11:00
Hugh Rundle
6765e1b4bd
update version
2021-01-29 15:50:07 +11:00
Hugh Rundle
95f34201bb
fix automerge value names
2021-01-29 15:29:59 +11:00
Hugh Rundle
4bdc907847
update Adelaide Hills website
2021-01-29 15:21:53 +11:00
Hugh Rundle
48ac89cb0d
Merge pull request #66 from hughrun/pr-check
...
whoops wrong username
2021-01-29 15:15:45 +11:00
Hugh Rundle
a11fc2cdf5
use automerge v1.1
2021-01-29 15:14:11 +11:00
Hugh Rundle
1d8d1b6f5c
whoops wrong username
2021-01-29 15:07:52 +11:00
Hugh Rundle
b7f34b846f
Merge pull request #65 from hughrun/pr-check
...
PR check action
2021-01-29 15:05:58 +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
7d378afd87
Merge pull request #64 from hughrun/auto-update-topo
...
Update TopoJSON
2021-01-29 11:19:35 +11:00
hughrun
b830962087
update TopoJSON
2021-01-29 00:17:56 +00:00
Hugh Rundle
e15d3d42f0
Merge pull request #63 from hughrun/armadale
...
update armadale libraries info
2021-01-29 11:16:51 +11:00
Hugh Rundle
53beb62ef9
update armadale libraries info
...
adds website and fines data
2021-01-29 11:15:03 +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