Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.12.0 #682

Merged
merged 99 commits into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ab25106
Add arduino icon
Kartstig Jun 8, 2020
fceb45e
Update all icon types
Kartstig Jan 8, 2021
2c50031
Add to icon registry
Kartstig Jan 8, 2021
d62c448
Merge remote-tracking branch 'upstream/master'
EnisMulic Jan 12, 2021
259ce31
Merge remote-tracking branch 'upstream/develop'
EnisMulic Jan 12, 2021
21bf571
Merge branch 'master' of https://github.com/devicons/devicon
EnisMulic Mar 16, 2021
b46e714
Add new icon: arduino (original, original-wordmark, plain, plain-word…
EnisMulic Mar 17, 2021
fb6d1fd
Update arduino icons
EnisMulic Mar 18, 2021
57cfffb
Merge branch 'develop' into new_icon_arduino
Panquesito7 Mar 18, 2021
ab02223
Merge branch 'develop' into new_icon_arduino
Panquesito7 Mar 23, 2021
0a04c7b
Merge branch 'develop' into new_icon_arduino
Panquesito7 Apr 1, 2021
8e8a8d3
Update arduino icons
EnisMulic Apr 9, 2021
5581398
Remove vscode folder
EnisMulic Apr 9, 2021
1a758a8
Merge branch 'new_icon_arduino' of https://github.com/EnisMulic/devic…
EnisMulic Apr 9, 2021
83febf4
Merge branch 'develop' into new_icon_arduino
Panquesito7 Apr 9, 2021
b8d6724
Update icons/arduino/arduino-original-wordmark.svg
Panquesito7 Apr 10, 2021
992f741
Update icons/arduino/arduino-original.svg
Panquesito7 Apr 10, 2021
e193cec
Update icons/arduino/arduino-plain-wordmark.svg
Panquesito7 Apr 10, 2021
8494d0e
Update icons/arduino/arduino-plain.svg
Panquesito7 Apr 10, 2021
6868f54
enhance guidelines for drafting a new release
amacado Apr 10, 2021
4b81fb2
Merge pull request #561 from devicons/amacado/feature/enhance-release…
Thomas-Boi Apr 10, 2021
4aec7b4
Bump ini from 1.3.5 to 1.3.8 (#562)
dependabot[bot] Apr 10, 2021
ec6a00a
Added a section for common bugs in the CONTRIBUTING (#563)
Thomas-Boi Apr 10, 2021
46c6df2
new icon: nixos (original, original-wordmark, plain, plain-wordmark) …
jeovazero Apr 12, 2021
e03bbbf
feat: Added perl icons
mattkoskela Apr 22, 2021
c378a7c
chore: Simplify svg files
mattkoskela Apr 22, 2021
a8851b7
fix: size fixes
mattkoskela Apr 22, 2021
77a587c
fix: Removed aliases from json
mattkoskela Apr 22, 2021
d4bf300
Merge branch 'develop' into master
Panquesito7 Apr 22, 2021
b30dc60
Add aliases (fixes the script)
Panquesito7 Apr 23, 2021
12252b3
Update devicon.json
Panquesito7 Apr 23, 2021
daa3338
Update devicon.json
Panquesito7 Apr 23, 2021
58abb24
fix: Renamed icons
mattkoskela Apr 23, 2021
f3cb640
fix: Cleaned up svg files and ran svg opimizer
mattkoskela Apr 24, 2021
5cf9dc8
Merge pull request #569 from mattkoskela/master
Thomas-Boi Apr 24, 2021
c42ff8c
Delete arduino-plain-wordmark.svg
Thomas-Boi Apr 27, 2021
2a16f53
Add Icomoon arduino-plain-wordmark.svg
Thomas-Boi Apr 27, 2021
56a8ab7
Rename arduino-plain-workmark.svg to arduino-plain-wordmark.svg
Thomas-Boi Apr 27, 2021
a9bc39b
Update devicon.json
Thomas-Boi Apr 27, 2021
0dad302
Merge branch 'develop' into new_icon_arduino
Thomas-Boi Apr 27, 2021
be0f017
Merge pull request #532 from EnisMulic/new_icon_arduino
Thomas-Boi Apr 27, 2021
41790e6
Script upgrades and updated CONTRIBUTING.md and README.md (#576)
Thomas-Boi Apr 29, 2021
066e58d
new icon: tensorflow (original, original-wordmark, plain, plain-wordm…
Apr 30, 2021
b09d685
new icon: tensorflow (original, original-wordmark, plain, plain-wordm…
Apr 30, 2021
65e21df
resized svgs
Apr 30, 2021
bd37828
cleaned up svgs
May 1, 2021
6ca3c12
compressed svgs and updated viewboxes
May 1, 2021
c3e18d5
new icon: zig (original, original-wordmark, plain-wordmark)
AtomToast May 1, 2021
4b12bc1
Replace raw.githubusercontent.com with jsdelivr (#586)
maltejur May 1, 2021
b492890
recommended svg fixes
May 1, 2021
4ce97a1
Merge branch 'develop' into master
Thomas-Boi May 3, 2021
47cc304
Merge branch 'develop' into icons/tensorflow
Thomas-Boi May 3, 2021
a918282
Merge pull request #587 from AtomToast/master
Thomas-Boi May 3, 2021
f84fa43
Merge branch 'develop' into icons/tensorflow
Thomas-Boi May 3, 2021
0b86f7c
Merge pull request #585 from reevesba/icons/tensorflow
Thomas-Boi May 3, 2021
2c6a21d
Clean up and CONTRIBUTING upgrade (#595)
Thomas-Boi May 12, 2021
d98a72c
Optimized SVG using SVGO (#597)
Thomas-Boi May 15, 2021
a5d5b00
Fix python wordmark icon (#103)
Kartstig May 15, 2021
0801235
New icon: raspberrypi (original, original-wordmark, line, line-wordma…
Thomas-Boi May 17, 2021
62199a9
New icon: tailwindcss (plain) (#610)
Utkarsh1504 May 21, 2021
e9b8e2e
Updated and optimized python svgs (#622)
Thomas-Boi May 24, 2021
1aaef6e
new icon: labview (original, original-wordmark, plain, plain-wordmark…
Thomas-Boi May 25, 2021
b0ab923
new icon: modx (original, original-wordmark, plain, plain-wordmark) (…
Thomas-Boi May 25, 2021
822cd70
new icon: knockout (plain-wordmark) (#628)
Thomas-Boi May 25, 2021
1e01930
new icon: embeddedc (original, plain, original-wordmark, plain-wordma…
Thomas-Boi May 25, 2021
48ebd6a
Optimize bot is now a part of the build script (#624)
Thomas-Boi May 27, 2021
9806f6e
Add extra requirement in new icon pr template (#642)
Thomas-Boi May 27, 2021
3c17944
new icon: rstudio (orignal. plain) (#634)
Thomas-Boi May 27, 2021
6f408bc
new icon: phalcon (original, plain) (#635)
Thomas-Boi May 27, 2021
24cb107
new icon: minitab (original, plain) (#636)
Thomas-Boi May 27, 2021
322c33e
new icon: bulma (plain) (#638)
Thomas-Boi May 27, 2021
b4f49d6
new icon: spss (original, plain) (#639)
Thomas-Boi May 27, 2021
23d922f
new icon: jest (plain) (#647)
Thomas-Boi May 27, 2021
9700cdd
update public-upload-to-imgur action v2.2.2 (#651)
amacado May 28, 2021
8cefca5
new icon: karma (original, plain) (#646)
Thomas-Boi May 28, 2021
610a1a3
new icon: circleci (plain, plain-wordmark) (#648)
Thomas-Boi May 28, 2021
e6c20fc
new icon: shopware (original, original-wordmark) (#653)
Thomas-Boi May 28, 2021
1ad7156
new icon: salesforce (original, plain) (#654)
Thomas-Boi May 28, 2021
2522b57
new icon: vuestorefront (original, plain) (#655)
Thomas-Boi May 28, 2021
bf16a51
new icon: codecov (plain) (#649)
Thomas-Boi May 29, 2021
192b31b
Add Unix icon (#659)
cseelus May 29, 2021
0fb272f
Peek bot won't check whether icon is in icomoon (#657)
Thomas-Boi May 30, 2021
63ca95a
new icon: magento (original, original-wordmark, line) (#652)
Thomas-Boi May 31, 2021
d2254e4
Fix svg checker double posting comment (#660)
Thomas-Boi May 31, 2021
b59e103
Update issue and PR templates (#658)
Thomas-Boi Jun 2, 2021
4e380c5
new icon: godot (original, original-wordmark, plain, plain-wordmark) …
Panquesito7 Jun 2, 2021
e2a7542
new icon: vscode (original, original-wordmark, plain, plain-wordmark)…
Panquesito7 Jun 3, 2021
72007cc
new icon: julia (original, original-wordmark, plain, plain-wordmark) …
maltejur Jun 6, 2021
ed562b4
new icon: matlab (line) (#640)
Thomas-Boi Jun 8, 2021
d4dd57d
new icon: crystal (original, original-wordmark) (#667)
Panquesito7 Jun 9, 2021
8d617d7
typo & grammar fixes in readme (#670)
ben-hampson Jun 9, 2021
d60b334
Build bot now build new SVGs in folder that were already built (#666)
Thomas-Boi Jun 13, 2021
c6876ae
new icon: tailwindcss (wordmark) (#671)
SaketKothari Jun 13, 2021
26e2c64
Minor update to CONTRIBUTING and post peek (#672)
Thomas-Boi Jun 13, 2021
794e859
Fix duplicated past icons in build process (#674)
Thomas-Boi Jun 13, 2021
2bb9596
Fixed issue with wrong name referencing from github api (#677)
Thomas-Boi Jun 13, 2021
e9bd2d8
bump npm version to v2.12.0
Thomas-Boi Jun 13, 2021
0aaa2fb
Built new icons, icomoon.json and devicon.css (#678)
github-actions[bot] Jun 13, 2021
9f3bb9a
Merge pull request #679 from devicons/draft-release
amacado Jun 13, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 59 additions & 15 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ First of all, thanks for taking the time to contribute! This project can only gr
<li><a href="#example">Example</a></li>
<li><a href="#requestingIcon">Requesting An Icon</a></li>
<li><a href="#teams">Maintainer/Reviewer/Teams</a></li>
<li><a href="#buildScript">Regarding the Build Script</a></li>
<li><a href="#buildScript">The Build Script: how it works and its quirks</a></li>
<li><a href="#discordServer">Discord server</a></li>
<li><a href="#release">Release strategy, conventions, preparation and execution</a></li>
</ul>
Expand Down Expand Up @@ -115,14 +115,29 @@ First of all, thanks for taking the time to contribute! This project can only gr
<pre>
<code>
{
"name": string, // the official name of the technology. Must be lower case, no space and don't have the dash '-' character.
"tags": string[], // list of tags relating to the technology for search purpose
// the official name of the technology. Must be lower case, no space and don't have the dash '-' character.
"name": string,

// list of tags relating to the technology for search purpose
"tags": string[],

// keep tracks of the different versions that you have.
"versions": {
"svg": VersionString[], // list the svgs that you have
"font": VersionString[] // list the fonts acceptable versions that you have
// list the svgs that you have
"svg": VersionString[],

// list the fonts acceptable versions that you have
"font": VersionString[]
},
"color": string, // the main color of the logo. Only track 1 color
"aliases": AliasObj[] // keeps track of the aliases for the font versions ONLY

// the main color of the logo. Only track 1 color
"color": string,

// keeps track of the aliases for the font versions ONLY
// see the <a href="#example">Example</a> section for more details
// NOTE: this attribute is not required from now on (see <a href='https://github.com/devicons/devicon/discussions/465'>this</a>)
// it is only being kept for backward compatibility
"aliases": AliasObj[]
}
</code>
</pre>
Expand Down Expand Up @@ -294,21 +309,50 @@ As an example, let's assume you have created the svgs for Redhat and Amazon Web
</p>

<hr>
<h2 id='buildScript'>Regarding The Build Script</h2>
<h2 id='buildScript'>The Build Script: how it works and its quirks</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 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>Preview what an svg would look like as an icon using the upload svgs script (see <a href="https://github.com/devicons/devicon/pull/412">this</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>Send screenshots to Imgur and upload it to a PR. See <a href="https://github.com/devicons/devicon/pull/398">the PR for the Imgur action</a> and <a href="https://github.com/devicons/devicon/pull/481"> the PR for uploading the pictures to a PR</a>
<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 to check that it looks good.
<li>Comment on the PR so maintainers don't have to manually upload icon result.</li>
<li>Publishing a new release to <a href="https://www.npmjs.com/package/devicon">npm</a>; See <a href="https://github.com/devicons/devicon/issues/288">#288</a></li>
</ul>

<p>There are some quirks and bugs that the build scripts might run into. Listed below are the common ones and their solution</p>
<ol>
<li><b>No connection could be made because the target machine actively refused it. (os error 10061)</b>
<ul>
<li>See <a href="https://github.com/devicons/devicon/runs/2292634069?check_suite_focus=true">this action</a> for an example.</li>
<li>Caused by Selenium being unable to connect to the Icomoon website. It is unknown why this happens but the hypothesis is Icomoon blocks Selenium's multiple connection request and treats them as bots. See <a href="https://github.com/devicons/devicon/pull/544#issuecomment-812147713">this</a>.</li>
<li>Solution: wait for a few minutes and rerun the script. Repeat until it works.</li>
</ul>
</li>
<li><b>SHA Integrity</b>
<ul>
<li>See <a href="https://github.com/devicons/devicon/runs/2310036084?check_suite_focus=true">this action</a> for an example.</li>
<li>Caused by the <code>package-lock.json</code>. Most likely the result of a dependabot update but not 100% sure.</li>
<li>Solution: Remove the <code>package-lock.json</code> and run `npm install` to generate a new file. Commit and push.</li>
</ul>
</li>
<li><b>Wrong PR Title</b>
<ul>
<li>The <code>bot-peek</code> script relies on the PR title to find the icon that was added in the PR. If the format doesn't match what is specified in <a href="#overview">Overview on Submitting Icon</a>, the bot will fail.</li>
<li>Solution: Ensure the name of the PR follows the convention.</li>
</ul>
</li>
<li><b>Peek bot fails when an icon is updated</b>
<ul>
<li>See <a href="https://github.com/devicons/devicon/pull/554">this PR</a> for an example.</li>
<li>The <code>bot-peek</code> script compares the <code>devicon.json</code> and <code>icomoon.json</code> to limit the icon uploading process. An update in the repo won't change anything in the <code>devicon.json</code> and <code>icomoon.json</code> so the script would report that nothing is found.</li>
<li>Solution: Follow the steps laid out <a href="https://github.com/devicons/devicon/pull/554#issuecomment-816860577">here</a></li>
</ul>
</li>
</ol>

<h2 id="discordServer">Discord server</h2>
<p>
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.
Expand All @@ -335,10 +379,10 @@ We are running a Discord server. You can go here to talk, discuss, and more with
<li>Push the branch <code>draft-release</code></li>
<li>Manually trigger the workflow <code><a href="https://github.com/devicons/devicon/actions/workflows/build_icons.yml">build_icons.yml</a></code> (which has a <code>workflow_dispatch</code> event trigger) and select the branch <code>draft-release</code> as target branch. This will build a font version of all icons using icomoon and automatically creates a pull request to merge the build result back into <code>draft-release</code></li>
<li>Review and approve the auto-create pull request created by the action of the step above</li>
<li>Create a pull request towards <code>development</code>. Mention the release number in the pull request title and add information about all new icons, fixes, features and enhancements in the description of the pull request. Take the commits as a guideline. It's also a good idea to mention and thank all contributions who participated in the release (take description of <code><a href="https://github.com/devicons/devicon/pull/504">#504</a></code> as an example).</li>
<li>Wait for review and approval of the pull request (<b>DON'T</b> perform a squash-merge)</li>
<li>Create a pull request towards <code>development</code>. Mention the release number in the pull request title (like "Build preparation for release v<i>MAJOR</i>.<i>MINOR</i>.<i>PATCH</i>) and add information about all new icons, fixes, features and enhancements in the description of the pull request. Take the commits as a guideline. It's also a good idea to mention and thank all contributions who participated in the release (take description of <code><a href="https://github.com/devicons/devicon/pull/504">#504</a></code> as an example).</li>
<li>Wait for review and approval of the pull request (you can perform a squash-merge)</li>
<li>Once merged create a pull request with BASE <code>master</code> and HEAD <code>development</code>. Copy the description of the earlier pull request.</li>
<li>Since it was already approved in the 'development' stage a maintainer is allowed to merge it (<b>DON'T</b> perform a squash-merge).</li>
<li>Create a <a href="https://github.com/devicons/devicon/releases/new">new release</a> using v<i>MAJOR</i>.<i>MINOR</i>.<i>PATCH</i> as tag and release title. Use the earlier created description as description of the release.</li>
<li>Publishing the release will trigger the <a href="/.github/workflows/npm_publish.yml">npm_publish.yml</a> workflow which will execute a <code>npm publish</code> leading to a updated <a href="https://www.npmjs.com/package/devicon">npm package</a> (v<i>MAJOR</i>.<i>MINOR</i>.<i>PATCH</i>).</li>
</ol>
</ol>
20 changes: 20 additions & 0 deletions devicon.json
Original file line number Diff line number Diff line change
Expand Up @@ -2345,6 +2345,26 @@
}
]
},
{
"name": "nixos",
"tags": [
"os"
],
"versions": {
"svg": [
"original",
"original-wordmark",
"plain",
"plain-wordmark"
],
"font": [
"plain",
"plain-wordmark"
]
},
"color": "#5277C3",
"aliases": []
},
{
"name": "nodejs",
"tags": [
Expand Down
1 change: 1 addition & 0 deletions icons/nixos/nixos-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/nixos/nixos-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/nixos/nixos-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/nixos/nixos-plain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.