Skip to content

Commit

Permalink
Merge branch 'develop' into new_icon_arduino
Browse files Browse the repository at this point in the history
  • Loading branch information
Panquesito7 authored Mar 17, 2021
2 parents b46e714 + 868a455 commit dc651b9
Show file tree
Hide file tree
Showing 18 changed files with 348 additions and 34 deletions.
31 changes: 17 additions & 14 deletions .github/workflows/peek_icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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
path: ./geckodriver.log
29 changes: 18 additions & 11 deletions .github/workflows/post_peek_screenshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
- name: Check state of last run
run: echo $PEEK_STATUS

- name: Download workflow artifact
uses: dawidd6/[email protected]
Expand All @@ -21,14 +27,14 @@ jobs:
run_id: ${{ github.event.workflow_run.id }}

- name: Read the pr_num file
if: success()
id: pr_num_reader
uses: juliangruber/[email protected]
with:
path: ./pr_num/pr_num.txt

- 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/[email protected]
with:
path: ./screenshots/new_icons.png
Expand All @@ -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/[email protected]
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,
Expand All @@ -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: |
Expand All @@ -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:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: 'Stale'
on:
schedule:
- cron: '30 1 * * *'

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@main
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-pr-message: 'Hello there,
we noticed that this PR has been inactive for a while now. If there are any changes which are suitable for our repository,
we would love to have it. It would be great if you can continue with this PR, but if you cannot, we might fork your changes and merge the changes ourselves.
Since GitHub tracks contributions by commits, you will still be credited.
Let us know what you think 😃'
stale-pr-label: 'stale'
days-before-pr-stale: 30
days-before-pr-close: -1
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<li><a href="#getting-started">Getting started</a></li>
<li><a href="#request-icon">Requesting icon</a></li>
<li><a href="#contribute">Contributing</a></li>
<li><a href="#stale-prs">Stale pull requests</a></li>
<li><a href="#build-yourself">Go build yourself</a></li>
</ol>

Expand Down Expand Up @@ -155,6 +156,11 @@ Add css rules in your stylesheet
to see how you can contribute to this project.
</p>

<h2 id="stale-prs">Stale pull requests</h2>
<p>
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.
</p>

<h2 id="build-yourself">Go build yourself</h2>
<p>
Feel free to follow those steps when you want to build the font
Expand Down
79 changes: 79 additions & 0 deletions devicon.json
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,27 @@
"color": "#f7974e",
"aliases": []
},
{
"name": "dart",
"tags": [
"programming",
"language"
],
"versions": {
"svg": [
"original",
"original-wordmark",
"plain",
"plain-wordmark"
],
"font": [
"plain",
"plain-wordmark"
]
},
"color": "#00A8E1",
"aliases": []
},
{
"name": "debian",
"tags": [
Expand Down Expand Up @@ -1087,6 +1108,23 @@
}
]
},
{
"name": "figma",
"tags": [
"design"
],
"versions": {
"svg": [
"original",
"plain"
],
"font": [
"plain"
]
},
"color": "#f24e1e",
"aliases": []
},
{
"name": "firebase",
"tags": [
Expand Down Expand Up @@ -1438,6 +1476,26 @@
"color": "#feb672",
"aliases": []
},
{
"name": "graphql",
"tags": [
"language",
"data",
"query"
],
"versions": {
"svg": [
"plain",
"plain-wordmark"
],
"font": [
"plain",
"plain-wordmark"
]
},
"color": "#e434aa",
"aliases": []
},
{
"name": "groovy",
"tags": [
Expand Down Expand Up @@ -3009,6 +3067,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": [
Expand Down
1 change: 1 addition & 0 deletions icons/dart/dart-original-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/dart/dart-original.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/dart/dart-plain-wordmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions icons/dart/dart-plain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions icons/figma/figma-original.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions icons/figma/figma-plain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit dc651b9

Please sign in to comment.