From a32bbeb96cbeb20b059cf665945021d38aecd441 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sat, 31 Jul 2021 18:13:40 +0100
Subject: [PATCH] :construction_worker: Combined GH action to credit
 contributors

---
 .github/workflows/generate-contributors.yml | 17 ---------
 .github/workflows/generate-credits.yml      | 40 +++++++++++++++++++++
 .github/workflows/insert-credits.yml        | 20 -----------
 docs/credits.md                             |  5 ++-
 4 files changed, 42 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/generate-contributors.yml
 create mode 100644 .github/workflows/generate-credits.yml
 delete mode 100644 .github/workflows/insert-credits.yml

diff --git a/.github/workflows/generate-contributors.yml b/.github/workflows/generate-contributors.yml
deleted file mode 100644
index 02fe2e6d..00000000
--- a/.github/workflows/generate-contributors.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Generates an image showing profile picture of everyone who'se contributed to Dashy
-# Which is embeded in the Readme Credits section, as they deserve some recognition
-name: Contributors
-on:
-  schedule:
-    - cron: '0 1 * * 0' # At 01:00 on Sunday.
-  push:
-    branches:
-      - master
-jobs:
-  contributors:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: bubkoo/contributors-list@v1
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          svgPath: docs/assets/CONTRIBUTORS.svg
diff --git a/.github/workflows/generate-credits.yml b/.github/workflows/generate-credits.yml
new file mode 100644
index 00000000..821ba113
--- /dev/null
+++ b/.github/workflows/generate-credits.yml
@@ -0,0 +1,40 @@
+# Inserts list of contributors and community members into ./docs/credits.md
+# Also generates an SVG showing all contributors, which is embedded into readme
+name: Contributors
+on:
+  workflow_dispatch: # Manual dispatch
+  schedule:
+    - cron: '0 1 * * 0' # At 01:00 on Sunday.
+jobs:
+  # Job #1 - Update the Credits page
+  insert-credits:
+    runs-on: ubuntu-latest
+    name: Inserts contributors into credits.md
+    steps:
+    - name: Contribute List
+      uses: akhilmhdh/contributors-readme-action@v2.2
+      env:
+          GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+      with:
+        image_size: 80
+        readme_path: docs/credits.md
+        columns_per_row: 6
+        commit_message: ':yellow_heart: Updates contributors list'
+        committer_username: liss-bot
+        committer_email: liss-bot@d0h.co
+  # Job #2 - Generate an embedded SVG asset, showing all contributors
+  generate-contributors:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: bubkoo/contributors-list@v1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          svgPath: docs/assets/CONTRIBUTORS.svg
+          affiliation: all
+          includeBots: false
+          excludeUsers: BeginCI snyk-bot
+          avatarSize: 96
+          userNameHeight: 20
+          svgWidth: 830
+          commitMessage: ':blue_heart: Updates contributor SVG'
+
diff --git a/.github/workflows/insert-credits.yml b/.github/workflows/insert-credits.yml
deleted file mode 100644
index 9d3976bd..00000000
--- a/.github/workflows/insert-credits.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generates and inserts a dynamic table of contributors,
-# sponsors, bots and helpful community members into ./docs/credits.md
-name: Insert Credits
-on: [push, pull_request]
-jobs:
-    contrib-readme-job:
-        runs-on: ubuntu-latest
-        name: Inserts contributors into credits.md
-        steps:
-            - name: Contribute List
-              uses: akhilmhdh/contributors-readme-action@v2.2
-              env:
-                  GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
-              with:
-                image_size: 80
-                readme_path: docs/credits.md
-                columns_per_row: 6
-                commit_message: ':yellow_heart: Updates contributors list'
-                committer_username: liss-bot
-                committer_email: liss-bot@d0h.co
diff --git a/docs/credits.md b/docs/credits.md
index 847071de..94b45511 100644
--- a/docs/credits.md
+++ b/docs/credits.md
@@ -14,7 +14,6 @@
 </table>
 <!-- readme: sponsors -end -->
 
-<!-- sponsors --><!-- sponsors -->
 ## Contributors
 <!-- readme: contributors -start -->
 <table>
@@ -100,7 +99,7 @@
 <!-- readme: EVOTk,shadowking001,turnrye,Robert-Ernst,MilesTEG1,Niklashere -end -->
 
 ## Bots
-<!-- readme: liss-bot,bots -start -->
+<!-- readme: liss-bot,snyk-bot,bots -start -->
 <table>
 <tr>
     <td align="center">
@@ -118,7 +117,7 @@
         </a>
     </td></tr>
 </table>
-<!-- readme: liss-bot,bots -end -->
+<!-- readme: liss-bot,snyk-bot,bots -end -->
 
 ## Dependencies 🔗