Commit graph

45 commits

Author SHA1 Message Date
Hugh Rundle 2c3cd34cd3 update workflows
- PR are now only tagged
- topo merge is done on push to master, not as part of PR
- this should resolve problems with arbitrary forked branches
2021-02-05 21:20:02 +11:00
Hugh Rundle a7ab8d399a Update update-topo-on-info-pr.yml
remove `head_ref` reference from actions/checkout to resolve error (see https://github.com/actions/checkout/issues/275)
2021-02-02 18:10:48 +11:00
Hugh Rundle 65b3d2a70b fix commiter name on topo update action 2021-02-01 19:47:36 +11:00
Hugh Rundle cf06a819cc exclude hughrun from contributors 2021-02-01 16:27:14 +11:00
Hugh Rundle ac2e9022ca add contributors action
adds GitHub Action to update the list of contributors when a new author pushes a change.
2021-01-31 21:22:24 +11:00
Hugh Rundle 7a2b83a97c rationalise workflows
- csv-to-topo updater now only works for PRs : csv shouldn't be directly updated in a push to master
- csv-to-topo can now be manually triggered if needed
- clearer formatting for actions
2021-01-29 21:10:39 +11:00
Hugh Rundle b4eb897c94 fix action name clash 2021-01-29 20:25:07 +11:00
Hugh Rundle bee5f4aa4d fix action logic to avoid recursion
ignore changes to 'boundaries.topo.json' on PUSH actions to avoid triggering the push action when PRs are merged, since they already got updated at the PR stage.
2021-01-29 20:19:20 +11:00
Hugh Rundle 4f3ef6963c update all actions
- replaces the topo-updater with 2 separate actions: one for direct pushes and one for PRs
- updates tag names
2021-01-29 20:12:08 +11:00
Hugh Rundle 83bbc6c12e add token to workflow 2021-01-29 19:37:20 +11:00
Hugh Rundle 13114a4fee update workflow actions 2021-01-29 19:03:47 +11:00
Hugh Rundle c526abb8ba bump automerge to 1.6 2021-01-29 17:51:26 +11:00
Hugh Rundle e710396e88
Update automerge.yml
bump to automerge v1.5
2021-01-29 17:23:53 +11:00
Hugh Rundle a1062761cd
Update automerge.yml
update automerge action version
2021-01-29 17:17:33 +11:00
Hugh Rundle 4e487291fb
Update automerge.yml
refresh workflow name
2021-01-29 17:12:00 +11:00
Hugh Rundle b4c07a9543 update action version 2021-01-29 16:53:44 +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 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 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 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 ebddda6882 change logic on if filter 2021-01-29 10:25:56 +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 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
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 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 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 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 ffdd84f240 fix filepath in action 2021-01-28 18:42:47 +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 0a948e38ca
fix filepaths in merge script 2021-01-26 17:37:39 +11:00
Hugh Rundle 8cfa9a50ca
Update merge-csv-to-topojson.yml
Fix missing '.' in filepath
2021-01-26 17:34:35 +11:00
Hugh Rundle 63f29c31c0 fix workflow 2021-01-26 17:25:19 +11:00
Hugh Rundle d3884a4e62 add github action scripts
- moves python script to .github directory
- also cleans up .gitignore
2021-01-26 16:56:43 +11:00