Merge pull request #333 from devicons/TB_bugFix

Comment Bot temporary bug fix, mocha font fix and build script update

Author: amacado

.github/workflows/build_icons.yml

@@ -1,11 +1,8 @@
 name: Build Icons
-on:
-  pull_request:
-      types: [labeled]
+on: workflow_dispatch
 jobs:
   build:
     name: Get Fonts From Icomoon
-    if: contains(github.event.pull_request.labels.*.name, 'bot:build')
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v2
@@ -46,7 +43,8 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           branch: ${{ format('build/{0}', github.head_ref) }}
+          base: 'develop'
           commit-message: 'Built new icons, icomoon.json and devicon.css'
           title: 'bot:build new icons, icomoon.json and devicon.css'
           body: 'Automated font-building task ran by GitHub Actions bot'
-          delete-branch: ${{true}}
+          delete-branch: true

.github/workflows/peek_icons.yml

@@ -38,16 +38,17 @@ jobs:
         with:
           name: new_icons
           path: ./new_icons.png
-      - name: Comment on the PR about the result
-        uses: github-actions-up-and-running/pr-comment@v1.0.1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          message: >
-            Hi! I'm Devicons' GitHub Actions Bot!
+      # - name: Comment on the PR about the result
+      #   uses: github-actions-up-and-running/pr-comment@v1.0.1
+      #   with:
+      #     repo-token: ${{ secrets.GITHUB_TOKEN }}
+      #     message: >
+      #       Hi! I'm Devicons' GitHub Actions Bot!
 
-            I just peeked at the icons that you wanted to add and upload them to the 
-            [Actions page](https://github.com/devicons/devicon/actions). The maintainers
-            will now take a look at it and decide whether to merge your PR.
+      #       I just peeked at the icons that you wanted to add and upload them to the 
+      #       [Actions page](https://github.com/devicons/devicon/actions). The maintainers
+      #       will now take a look at it and decide whether to merge your PR.
 
-            Cheers :),
-            Bot
+      #       Cheers :),
+      
+      #       Bot

CONTRIBUTING.md

@@ -26,9 +26,8 @@ First of all, thanks for taking the time to contribute! This project can only gr
   <li>Include the name of the icon in the pull request title. Follow this format: <code>new icon: {{logoName}} ({{versions}})</code> </li>
   <li><i>Optional</i>: Add images of the new icon(s) to the description of the pull request. This would help speed up the review process </li>
   <li><i>Optional</i>: Reference the issues regarding the new icon. </li>
-  <li>Wait for a repo maintainer to review your changes. Once they are satisfied, they will <a href="#buildScript">build your repo </a>. This will create a PR into your branch.</li>
-  <li>Review the PR. It should contain the icon versions of your svgs. Accept the changes if you are satisfied</li>
-  <li>Once you accept the changes, a maintainer will accept your PR into the repo.</li>
+  <li>Wait for a repo maintainer to review your changes. They will run a script to check your icons. </li>
+  <li>If there are no issue, they will accept your PR into the repo. Else, they will let you know and give you a chance to fix it.</li>
 </ol>
 
 <hr>
@@ -64,6 +63,8 @@ Some icons are really simple (like the Apple one), so the original version can b
   </li>
   <li>Optimize/compress your SVGs. You can use a service like <a href="https://compressor.io/">compressor</a> or <a href="https://petercollingridge.appspot.com/svg-editor">SVG Editor</a>.</li>
   <li>The icon's strokes and texts must be fills. We use Icomoon to make our icon, which has its<a href="https://icomoon.io/#docs/stroke-to-fill"> requirements</a></li>
+  <li>Each <code>.svg</code> file contains one version of an icon in a <code>0 0 128 128</code> viewbox</li>
+  <li>The naming convention for the svg file is the following: <code>(icon name)-(original|plain|line)-(wordmark)</code></li>
 </ul>
 
 <hr>
@@ -72,8 +73,6 @@ Some icons are really simple (like the Apple one), so the original version can b
   <li>Each icon has its own folder located in the <code>icons</code> folder</li>
   <li>Each icon folder contains one <code>.eps</code> file and as many <code>.svg</code> files as versions available</li>
   <li>The <code>.eps</code> file contains all available versions of an icon. Each version is contained in a 128px by 128px artboard</li>
-  <li>Each <code>.svg</code> file contains one version of an icon in a <code>0 0 128 128</code> viewbox</li>
-  <li>The naming convention for the svg file is the following: <code>(icon name)-(original|plain|line)-(wordmark)</code></li>
 </ul>
 
 <hr>
@@ -158,6 +157,7 @@ As an example, let's assume you have created the svgs for Amazon Web Services an
                 "font": [ // here are the versions that will be used to create icons
                   "original", // original is simple enough to be used as plain
                   "plain-wordmark",
+                  // note that the alias "plain" is not listed here. It must be listed in the `aliases` attribute
                 ]
               },
               "color": "#F7A80D", // note the '#' character
@@ -232,9 +232,13 @@ As an example, let's assume you have created the svgs for Amazon Web Services an
 <hr>
 <h2 id='buildScript'>Regarding The Build Script</h2>
 <p>To make adding icons easier for repo maintainers, we rely on GitHub Actions, Python, Selenium, and Gulp to automate our tasks.</p>
-<p>So far, the tasks that we have automated are:</p>
+<p>So far, the tasks in the build script are:</p>
 <ul>
   <li>Upload svgs to <a href="https://icomoon.io/app/#/select">icomoon.io</a> and get the icons back. For details, see <a href="https://github.com/devicons/devicon/issues/252"> the original disscussion</a>, <a href="https://github.com/devicons/devicon/pull/268">this PR that introduce the feature</a> and <a href="https://github.com/devicons/devicon/issues/300">the final changes to it.</a></li>
   <li>Build, combine, and minify CSS files. For details, see <a href="https://github.com/devicons/devicon/pull/290">this</a></li>
+</ul>
+<p>There are also other tasks that we are automating, such as:</p>
+<ul>
   <li>Ensure code quality is up to standard</li>
+  <li>Upload svgs to <a href="https://icomoon.io/app/#/select">icomoon.io</a> and take a screenshot for check.
 </ul>