From cb3424746773893b27b6c7868ccac798de8d561b Mon Sep 17 00:00:00 2001
From: Thomas Bui <43018778+Thomas-Boi@users.noreply.github.com>
Date: Thu, 25 Feb 2021 05:34:21 -0800
Subject: [PATCH 01/12] Fix issue with "post_peek_screenshot" action failing
when it's not supposed to (#520)
* Change the boolean in post_check_svgs_comment
* Fixed issue where post_peek action would fail randomly
* Fixed post_peek action not acting correctly
* Apply suggestions from code review (change to PR Number)
Co-authored-by: David Leal
Co-authored-by: David Leal
---
.github/workflows/peek_icons.yml | 31 ++++++++++++----------
.github/workflows/post_peek_screenshot.yml | 29 ++++++++++++--------
2 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/peek_icons.yml b/.github/workflows/peek_icons.yml
index ac5062bd..20f3455f 100644
--- a/.github/workflows/peek_icons.yml
+++ b/.github/workflows/peek_icons.yml
@@ -3,7 +3,10 @@ on:
pull_request:
types: [labeled]
jobs:
- build:
+ peek:
+ # four outcomes: successful check and upload,
+ # unsuccessful check (fail due to user),
+ # fail due to system, skipped
name: Peek Icons
if: github.event.label.name == 'bot:peek'
runs-on: windows-2019
@@ -20,6 +23,18 @@ jobs:
python -m pip install --upgrade pip
pip install -r ./.github/scripts/requirements.txt
+ - name: Save the PR number in an artifact
+ shell: bash
+ env:
+ PR_NUM: ${{ github.event.number }}
+ run: echo $PR_NUM > pr_num.txt
+
+ - name: Upload the PR number
+ uses: actions/upload-artifact@v2
+ with:
+ name: pr_num
+ path: ./pr_num.txt
+
- name: Run icomoon_peek.py
env:
PR_TITLE: ${{ github.event.pull_request.title }}
@@ -36,21 +51,9 @@ jobs:
name: screenshots
path: ./screenshots/*.png
- - name: Save the pr num in an artifact
- shell: bash
- env:
- PR_NUM: ${{ github.event.number }}
- run: echo $PR_NUM > pr_num.txt
-
- - name: Upload the pr num
- uses: actions/upload-artifact@v2
- with:
- name: pr_num
- path: ./pr_num.txt
-
- name: Upload geckodriver.log for debugging purposes
uses: actions/upload-artifact@v2
if: failure()
with:
name: geckodriver-log
- path: ./geckodriver.log
\ No newline at end of file
+ path: ./geckodriver.log
diff --git a/.github/workflows/post_peek_screenshot.yml b/.github/workflows/post_peek_screenshot.yml
index 541441f3..0a7a3ae9 100644
--- a/.github/workflows/post_peek_screenshot.yml
+++ b/.github/workflows/post_peek_screenshot.yml
@@ -8,10 +8,16 @@ jobs:
post_screenshots_in_comment:
name: Post the screenshot
runs-on: ubuntu-18.04
+ if: github.event.action == 'completed' && github.event.workflow_run.conclusion != 'skipped'
+ env:
+ # three possible values: 'skipped', 'success', 'failure'
+ # have to print github.event to console to see these values
+ # note: can't use this env variable up in the if statement above for some reason.
+ # I don't think it's an ordering issue cause it seems 'if' is auto evaluate first
+ PEEK_STATUS: ${{ github.event.workflow_run.conclusion }}
steps:
- - name: Check if the trigger run worked. If not, fail the current run.
- if: github.event.workflow_run.conclusion != 'success'
- uses: cutenode/action-always-fail@v1.0.1
+ - name: Check state of last run
+ run: echo $PEEK_STATUS
- name: Download workflow artifact
uses: dawidd6/action-download-artifact@v2.11.0
@@ -21,7 +27,6 @@ jobs:
run_id: ${{ github.event.workflow_run.id }}
- name: Read the pr_num file
- if: success()
id: pr_num_reader
uses: juliangruber/read-file-action@v1.0.0
with:
@@ -29,6 +34,7 @@ jobs:
- name: Upload screenshot of the newly made icons gotten from the artifacts
id: icons_overview_img_step
+ if: env.PEEK_STATUS == 'success' && success()
uses: devicons/public-upload-to-imgur@v2.2.1
with:
path: ./screenshots/new_icons.png
@@ -37,17 +43,15 @@ jobs:
- name: Upload zoomed in screenshot of the newly made icons gotten from the artifacts
id: icons_detailed_img_step
uses: devicons/public-upload-to-imgur@v2.2.1
- if: success()
+ if: env.PEEK_STATUS == 'success' && success()
with:
path: ./screenshots/screenshot_*.png
client_id: ${{secrets.IMGUR_CLIENT_ID}}
- name: Comment on the PR about the result - Success
uses: jungwinter/comment@v1 # let us comment on a specific PR
- if: success()
+ if: env.PEEK_STATUS == 'success' && success()
env:
- OVERVIEW_IMG_MARKDOWN: ${{ fromJSON(steps.icons_overview_img_step.outputs.markdown_urls)[0] }}
- DETAILED_IMGS_MARKDOWN: ${{ join(fromJSON(steps.icons_detailed_img_step.outputs.markdown_urls), '') }}
MESSAGE: |
Hi there,
@@ -71,10 +75,13 @@ jobs:
type: create
issue_number: ${{ steps.pr_num_reader.outputs.content }}
token: ${{ secrets.GITHUB_TOKEN }}
- body: ${{format(env.MESSAGE, env.OVERVIEW_IMG_MARKDOWN, env.DETAILED_IMGS_MARKDOWN)}}
+ body: >
+ ${{ format(env.MESSAGE,
+ fromJSON(steps.icons_overview_img_step.outputs.markdown_urls)[0],
+ join(fromJSON(steps.icons_detailed_img_step.outputs.markdown_urls), '')) }}
- name: Comment on the PR about the result - Failure
- if: failure() || cancelled()
+ if: failure() || env.PEEK_STATUS == 'failure'
uses: jungwinter/comment@v1 # let us comment on a specific PR
env:
MESSAGE: |
@@ -88,7 +95,7 @@ jobs:
- Your icon information has been added to the `devicon.json` as seen [here](https://github.com/devicons/devicon/blob/master/CONTRIBUTING.md#updateDevicon)
- Your PR title follows the format seen [here](https://github.com/devicons/devicon/blob/master/CONTRIBUTING.md#overview)
- Once everything is fixed, I will try. If I still fail (sorry!), the maintainers will investigate further.
+ I will retry once everything is fixed. If I still fail (sorry!) or there are other erros, the maintainers will investigate.
Best of luck,
Peek Bot :relaxed:
From 03e31448d5b57df5716dcb7535f6b1be7a4f8693 Mon Sep 17 00:00:00 2001
From: David Leal
Date: Thu, 25 Feb 2021 13:49:42 -0600
Subject: [PATCH 02/12] new icon: TheAlgorithms (original, original-wordmark,
plain, plain-wordmark)
---
devicon.json | 21 ++++++++
.../thealgorithms-original-wordmark.svg | 53 +++++++++++++++++++
.../thealgorithms/thealgorithms-original.svg | 13 +++++
.../thealgorithms-plain-wordmark.svg | 53 +++++++++++++++++++
icons/thealgorithms/thealgorithms-plain.svg | 13 +++++
5 files changed, 153 insertions(+)
create mode 100644 icons/thealgorithms/thealgorithms-original-wordmark.svg
create mode 100644 icons/thealgorithms/thealgorithms-original.svg
create mode 100644 icons/thealgorithms/thealgorithms-plain-wordmark.svg
create mode 100644 icons/thealgorithms/thealgorithms-plain.svg
diff --git a/devicon.json b/devicon.json
index b5af5765..8c7cc9e0 100644
--- a/devicon.json
+++ b/devicon.json
@@ -2983,6 +2983,27 @@
"color": "#bb2031",
"aliases": []
},
+ {
+ "name": "thealgorithms",
+ "tags": [
+ "organization",
+ "algorithms"
+ ],
+ "versions": {
+ "svg": [
+ "original",
+ "original-wordmark",
+ "plain",
+ "plain-wordmark"
+ ],
+ "font": [
+ "plain",
+ "plain-wordmark"
+ ]
+ },
+ "color": "#00BCB4",
+ "aliases": []
+ },
{
"name": "trello",
"tags": [
diff --git a/icons/thealgorithms/thealgorithms-original-wordmark.svg b/icons/thealgorithms/thealgorithms-original-wordmark.svg
new file mode 100644
index 00000000..f34dc75f
--- /dev/null
+++ b/icons/thealgorithms/thealgorithms-original-wordmark.svg
@@ -0,0 +1,53 @@
+
+
+
diff --git a/icons/thealgorithms/thealgorithms-original.svg b/icons/thealgorithms/thealgorithms-original.svg
new file mode 100644
index 00000000..a7461fe6
--- /dev/null
+++ b/icons/thealgorithms/thealgorithms-original.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/icons/thealgorithms/thealgorithms-plain-wordmark.svg b/icons/thealgorithms/thealgorithms-plain-wordmark.svg
new file mode 100644
index 00000000..1c27d0ed
--- /dev/null
+++ b/icons/thealgorithms/thealgorithms-plain-wordmark.svg
@@ -0,0 +1,53 @@
+
+
+
diff --git a/icons/thealgorithms/thealgorithms-plain.svg b/icons/thealgorithms/thealgorithms-plain.svg
new file mode 100644
index 00000000..5e594a37
--- /dev/null
+++ b/icons/thealgorithms/thealgorithms-plain.svg
@@ -0,0 +1,13 @@
+
+
+
From 5ec117d560e5822faa5829adfa99173ff82c2bba Mon Sep 17 00:00:00 2001
From: David Leal
Date: Thu, 25 Feb 2021 14:17:55 -0600
Subject: [PATCH 03/12] Fix errors reported by GitHub Actions
---
.../thealgorithms-original-wordmark.svg | 30 +++++++++----------
.../thealgorithms/thealgorithms-original.svg | 3 +-
.../thealgorithms-plain-wordmark.svg | 30 +++++++++----------
icons/thealgorithms/thealgorithms-plain.svg | 3 +-
4 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/icons/thealgorithms/thealgorithms-original-wordmark.svg b/icons/thealgorithms/thealgorithms-original-wordmark.svg
index f34dc75f..f3c9ca19 100644
--- a/icons/thealgorithms/thealgorithms-original-wordmark.svg
+++ b/icons/thealgorithms/thealgorithms-original-wordmark.svg
@@ -3,48 +3,46 @@
+
Stale pull requests
+
+After a pull request has been open for over 30 days with no activity or response from the author, it'll be automatically marked as stale. We might fork your changes and merge the changes ourselves. Since GitHub tracks contributions by commits, you will be credited.
+
-First of all, thanks for taking the time to contribute! This project can only grow and live by your countless contributions. To keep this project maintable we developed some guidelines for contributions.
+First of all, thanks for taking the time to contribute! This project can only grow and live by your countless contributions. To keep this project maintainable, we have developed some guidelines for our contributors.
Table of Content
@@ -15,6 +15,7 @@ First of all, thanks for taking the time to contribute! This project can only gr
+We are running a Discord server. You can go here to talk, discuss, and more with the maintainers and other people, too. Here's the invitation: https://discord.gg/hScy8KWACQ. If you don't have a GitHub account but want to suggest ideas or new icons, you can do that here in our Discord channel.
+
diff --git a/README.md b/README.md
index 4ac6b4ca..5ae052df 100644
--- a/README.md
+++ b/README.md
@@ -161,6 +161,11 @@ Add css rules in your stylesheet
After a pull request has been open for over 30 days with no activity or response from the author, it'll be automatically marked as stale. We might fork your changes and merge the changes ourselves. Since GitHub tracks contributions by commits, you will be credited.
+
Discord server
+
+We are running a Discord server. You can go here to talk, discuss, and more with the maintainers and other people, too. Here's the invitation: https://discord.gg/hScy8KWACQ.
+
+
Go build yourself
Feel free to follow those steps when you want to build the font
diff --git a/docs/assets/css/discord-logo.svg b/docs/assets/css/discord-logo.svg
new file mode 100644
index 00000000..08daae68
--- /dev/null
+++ b/docs/assets/css/discord-logo.svg
@@ -0,0 +1 @@
+
diff --git a/docs/assets/css/style.css b/docs/assets/css/style.css
index 1c1d2ae2..2c4bb129 100644
--- a/docs/assets/css/style.css
+++ b/docs/assets/css/style.css
@@ -8,6 +8,14 @@ html {
*, *::after, *::before {
box-sizing: inherit; }
+.discord-logo:before {
+ content: "";
+ background-image: url("discord-logo.svg");
+ height: 40px;
+ width: 40px;
+ display: inline-block;
+ background-size: cover;
+}
.icon-brush:before {
content: "\e600"; }
diff --git a/docs/index.html b/docs/index.html
index 98aed988..8c9dec6b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -88,17 +88,20 @@
-
Github Repo
-
If you prefer a local install, you can download all the files on the github repo.
+
GitHub repository
+
If you prefer a local install, you can download all the files on the GitHub repository.
Originally created by Konpa (under MIT License) and
From d0b660589b3e4f7edf74d22123fa343c45b25e51 Mon Sep 17 00:00:00 2001
From: David Leal
Date: Mon, 22 Mar 2021 12:22:04 -0600
Subject: [PATCH 12/12] Mention that the Discord server is unofficial
---
CONTRIBUTING.md | 1 +
README.md | 1 +
2 files changed, 2 insertions(+)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 133f8133..89b141f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -304,4 +304,5 @@ As an example, let's assume you have created the svgs for Redhat and Amazon Web
Discord server
We are running a Discord server. You can go here to talk, discuss, and more with the maintainers and other people, too. Here's the invitation: https://discord.gg/hScy8KWACQ. If you don't have a GitHub account but want to suggest ideas or new icons, you can do that here in our Discord channel.
+Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub.
diff --git a/README.md b/README.md
index 5ae052df..c0e6bae1 100644
--- a/README.md
+++ b/README.md
@@ -164,6 +164,7 @@ After a pull request has been open for over 30 days with no activity or response
Discord server
We are running a Discord server. You can go here to talk, discuss, and more with the maintainers and other people, too. Here's the invitation: https://discord.gg/hScy8KWACQ.
+Note that the Discord server is unofficial, and Devicons is still being maintained via GitHub.