Skip to content

Commit

Permalink
Merge branch 'develop' into TB/magento
Browse files Browse the repository at this point in the history
  • Loading branch information
amacado committed May 28, 2021
2 parents 16ad385 + 610a1a3 commit 55bfc2f
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Upload screenshot of the newly made icons
id: imgur_step
uses: devicons/public-upload-to-imgur@v2.1.1
uses: devicons/public-upload-to-imgur@v2.2.2
if: success()
with:
path: ./new_icons.png
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/post_peek_screenshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ 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
uses: devicons/public-upload-to-imgur@v2.2.2
with:
path: ./screenshots/new_icons.png
client_id: ${{secrets.IMGUR_CLIENT_ID}}

- 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
uses: devicons/public-upload-to-imgur@v2.2.2
if: env.PEEK_STATUS == 'success' && success()
with:
path: ./screenshots/screenshot_*.png
Expand Down
20 changes: 20 additions & 0 deletions devicon.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,16 @@
"color": "#ce4e4e",
"aliases": []
},
{
"name": "circleci",
"tags": ["integration", "platform"],
"versions": {
"svg": ["plain", "plain-wordmark"],
"font": ["plain", "plain-wordmark"]
},
"color": "#343434",
"aliases": []
},
{
"name": "clojure",
"tags": [
Expand Down Expand Up @@ -2025,6 +2035,16 @@
"color": "#F37726",
"aliases": []
},
{
"name": "karma",
"tags": ["testing", "test-runner"],
"versions": {
"svg": ["original", "plain"],
"font": ["plain"]
},
"color": "#56c5a8",
"aliases": []
},
{
"name": "kotlin",
"tags": [
Expand Down
3 changes: 3 additions & 0 deletions icons/circleci/circleci-plain-wordmark.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/circleci/circleci-plain.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/circleci/circleci.eps
Binary file not shown.
4 changes: 4 additions & 0 deletions icons/karma/karma-original.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/karma/karma-plain.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/karma/karma.eps
Binary file not shown.

0 comments on commit 55bfc2f

Please sign in to comment.