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:
parent
f801406112
commit
301e0e419d
7
.github/workflows/add-contributors.yml
vendored
7
.github/workflows/add-contributors.yml
vendored
|
@ -3,9 +3,10 @@ name: Add contributors
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- "master"
|
- master
|
||||||
- "main"
|
- main
|
||||||
|
paths:
|
||||||
|
- '!website/data/library_services_information.csv'
|
||||||
jobs:
|
jobs:
|
||||||
update-contributors:
|
update-contributors:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
1
.github/workflows/minify-map-json.yml
vendored
1
.github/workflows/minify-map-json.yml
vendored
|
@ -3,6 +3,7 @@ on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
- main
|
||||||
paths:
|
paths:
|
||||||
- 'boundaries.geo.json'
|
- 'boundaries.geo.json'
|
||||||
|
|
||||||
|
|
9
.github/workflows/update-topo-on-push.yml
vendored
9
.github/workflows/update-topo-on-push.yml
vendored
|
@ -3,7 +3,8 @@ name: topo update (push)
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- 'master'
|
- master
|
||||||
|
- main
|
||||||
paths:
|
paths:
|
||||||
- 'website/data/library_services_information.csv'
|
- 'website/data/library_services_information.csv'
|
||||||
|
|
||||||
|
@ -23,6 +24,12 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
python3 ./.github/scripts/merge_csv_to_topojson.py
|
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
|
- uses: stefanzweifel/git-auto-commit-action@v4
|
||||||
with:
|
with:
|
||||||
commit_message: merge csv data to topo
|
commit_message: merge csv data to topo
|
||||||
|
|
Loading…
Reference in a new issue