From 301e0e419dff3f7ec839c9ea6a5ab5c2b6c06fec Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 6 Feb 2021 12:37:51 +1100 Subject: [PATCH] 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. --- .github/workflows/add-contributors.yml | 7 ++++--- .github/workflows/minify-map-json.yml | 1 + .github/workflows/update-topo-on-push.yml | 9 ++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/add-contributors.yml b/.github/workflows/add-contributors.yml index a991334..fb25eb3 100644 --- a/.github/workflows/add-contributors.yml +++ b/.github/workflows/add-contributors.yml @@ -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 diff --git a/.github/workflows/minify-map-json.yml b/.github/workflows/minify-map-json.yml index ede0ea1..e446576 100644 --- a/.github/workflows/minify-map-json.yml +++ b/.github/workflows/minify-map-json.yml @@ -3,6 +3,7 @@ on: push: branches: - master + - main paths: - 'boundaries.geo.json' diff --git a/.github/workflows/update-topo-on-push.yml b/.github/workflows/update-topo-on-push.yml index d2fc1e3..5cbf22a 100644 --- a/.github/workflows/update-topo-on-push.yml +++ b/.github/workflows/update-topo-on-push.yml @@ -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