Skip to content

Commit 2ae2a90

Browse files
authored
Merge pull request #842 from devicons/develop
Release v2.14.0
2 parents 00f02ef + 71049a2 commit 2ae2a90

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+498
-296
lines changed

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ body:
2222
attributes:
2323
label: Why should we have this feature?
2424
description: List any extra benefits, other than solving your problem, that this feature will bring to the repository. If none, leave blank.
25-
validations:
26-
required: false
25+
validations:
26+
required: false
2727
- type: textarea
2828
id: extrainformation
2929
attributes:

.github/ISSUE_TEMPLATE/icon_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Icon Request
22
description: Requesting a new icon or changes to an existing icon
33
title: 'Icon request: [NAME]'
4-
labels: [request:icon]
4+
labels: ["request:icon"]
55
body:
66
- type: input
77
id: about
Binary file not shown.

.github/scripts/build_assets/geckodriver-v0.27.0-win64/README.md renamed to .github/scripts/build_assets/geckodriver-v0.29.1-win64/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Proxy for using W3C WebDriver compatible clients to interact with Gecko-based br
33
This program provides the HTTP API described by the WebDriver protocol to communicate with Gecko browsers, such as Firefox.
44
It translates calls into the Marionette remote protocol by acting as a proxy between the local- and remote ends.
55

6-
This application was taken from: https://github.com/mozilla/geckodriver/releases/tag/v0.27.0
6+
This application was taken from: https://github.com/mozilla/geckodriver/releases/tag/v0.29.1
Binary file not shown.

.github/scripts/build_assets/selenium_runner/PeekSeleniumRunner.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,18 @@ def peek_icons(self, svgs: List[str], screenshot_folder: str):
8686
main_content.screenshot(new_icons_path);
8787

8888
# go downward so we get the oldest icon first
89-
len_ = len(svgs)
90-
for i in range(len_, 0, -1):
91-
xpath = f'//*[@id="glyphSet0"]/div[{i}]'
92-
icon_div = self.driver.find_element_by_xpath(xpath)
89+
icon_divs_xpath = f'//div[@id="glyphSet0"]/div'
90+
icon_divs = self.driver.find_elements_by_xpath(icon_divs_xpath)
91+
icon_divs.reverse()
92+
i = 0
93+
for icon_div in icon_divs:
94+
if not icon_div.is_displayed():
95+
continue
9396

94-
# crop the div out from the screenshot
9597
icon_screenshot = str(
96-
Path(screenshot_folder, f"new_icon_{len_ - i}.png").resolve()
98+
Path(screenshot_folder, f"new_icon_{i}.png").resolve()
9799
)
98100
icon_div.screenshot(icon_screenshot)
101+
i += 1
99102

100103
print("Finished peeking the icons...")

.github/workflows/build_icons.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2424
run: >
2525
python ./.github/scripts/icomoon_build.py
26-
./.github/scripts/build_assets/geckodriver-v0.27.0-win64/geckodriver.exe ./icomoon.json
26+
./.github/scripts/build_assets/geckodriver-v0.29.1-win64/geckodriver.exe ./icomoon.json
2727
./devicon.json ./icons ./ %GITHUB_TOKEN% --headless
2828
2929
- name: Upload geckodriver.log for debugging purposes

.github/workflows/peek_icons.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
shell: cmd
4242
run: >
4343
python ./.github/scripts/icomoon_peek.py
44-
./.github/scripts/build_assets/geckodriver-v0.27.0-win64/geckodriver.exe ./icomoon.json
44+
./.github/scripts/build_assets/geckodriver-v0.29.1-win64/geckodriver.exe ./icomoon.json
4545
./devicon.json ./icons ./ --headless --pr_title "%PR_TITLE%"
4646
4747
- name: Upload the err messages (created by icomoon_peek.py)

CONTRIBUTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ First of all, thanks for taking the time to contribute! This project can only gr
1616
<li><a href="#example">Example of Submitting An Icon</a></li>
1717
<li><a href="#updatingIcons">Updating an Icon</a></li>
1818
<li><a href="#teams">Maintainer/Reviewer/Teams</a></li>
19-
<li><a href="#buildScript">Our Workflows: how they work and their issues</a></li>
19+
<li><a href="#buildScript">Our Workflows: how they work</a></li>
20+
<li><a href="#bugs">Common Bugs and Solutions</a></li>
2021
<li><a href="#discordServer">Discord server</a></li>
2122
<li><a href="#release">Release strategy, conventions, preparation and execution</a></li>
2223
</ul>
@@ -411,6 +412,8 @@ As an example, let's assume you have created the SVGs for Redhat and Amazon Web
411412
<li>Creating a list of features that was added since last release. See <a href="https://github.com/devicons/devicon/discussions/574">this discussion</a> for inception and limitations. </li>
412413
</ul>
413414

415+
<hr>
416+
<h2 id='bugs'>Common Bugs and Solutions</h2>
414417
<p>There are some bugs that the build scripts might run into. Listed below are the common ones and their solutions</p>
415418
<ol>
416419
<li><b>No connection could be made because the target machine actively refused it. (os error 10061)</b>
@@ -437,7 +440,7 @@ As an example, let's assume you have created the SVGs for Redhat and Amazon Web
437440
<ul>
438441
<li>See <a href="https://github.com/devicons/devicon/pull/532">this PR</a>'s peek result.</li>
439442
<li>This is caused by a bug in Icomoon's parser (see <a href="https://github.com/devicons/devicon/pull/532#issuecomment-827180766">this</a>).</li>
440-
<li>Solution: Luckily this is an extremely rare case. Try remake the SVG in a different way (using different paths/shapes) and test using Icomoon.</li>
443+
<li>Solution: Luckily this is an extremely rare case. Try remaking the SVG in a different way (using different paths/shapes). If your text/paths are joined with another object (say, the logo), try splitting them into individual paths (see <a href="https://github.com/devicons/devicon/pull/816#issuecomment-904021383">this PR</a>). You can always test using Icomoon to see if your fix works.</li>
441444
</ul>
442445
</li>
443446
</ol>

0 commit comments

Comments
 (0)