fix action conflict

The add-contributors action and the update-topo action both want to check out the current branch and add a commit at the same time, which causes conflicts. This adds contributors as part of the update-topo action and prevents the contributor update action running if `library_services_information.csv` has changed in the original commit.
This commit is contained in:
Hugh Rundle 2021-02-06 12:37:51 +11:00
parent f801406112
commit 301e0e419d
3 changed files with 13 additions and 4 deletions

View file

@ -3,9 +3,10 @@ name: Add contributors
on:
push:
branches:
- "master"
- "main"
- master
- main
paths:
- '!website/data/library_services_information.csv'
jobs:
update-contributors:
runs-on: ubuntu-latest

View file

@ -3,6 +3,7 @@ on:
push:
branches:
- master
- main
paths:
- 'boundaries.geo.json'

View file

@ -3,7 +3,8 @@ name: topo update (push)
on:
push:
branches:
- 'master'
- master
- main
paths:
- 'website/data/library_services_information.csv'
@ -23,6 +24,12 @@ jobs:
run: |
python3 ./.github/scripts/merge_csv_to_topojson.py
- name: Update contributors
run: |
npm install cheerio
npm install pretty
node ./.github/scripts/contributors.js
- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: merge csv data to topo