Skip to content

Commit

Permalink
Merge pull request #842 from devicons/develop
Browse files Browse the repository at this point in the history
Release v2.14.0
  • Loading branch information
Thomas-Boi authored Sep 9, 2021
2 parents 00f02ef + 71049a2 commit 2ae2a90
Show file tree
Hide file tree
Showing 47 changed files with 498 additions and 296 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ body:
attributes:
label: Why should we have this feature?
description: List any extra benefits, other than solving your problem, that this feature will bring to the repository. If none, leave blank.
validations:
required: false
validations:
required: false
- type: textarea
id: extrainformation
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/icon_request.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Icon Request
description: Requesting a new icon or changes to an existing icon
title: 'Icon request: [NAME]'
labels: [request:icon]
labels: ["request:icon"]
body:
- type: input
id: about
Expand Down
File renamed without changes.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Proxy for using W3C WebDriver compatible clients to interact with Gecko-based br
This program provides the HTTP API described by the WebDriver protocol to communicate with Gecko browsers, such as Firefox.
It translates calls into the Marionette remote protocol by acting as a proxy between the local- and remote ends.

This application was taken from: https://github.com/mozilla/geckodriver/releases/tag/v0.27.0
This application was taken from: https://github.com/mozilla/geckodriver/releases/tag/v0.29.1
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,18 @@ def peek_icons(self, svgs: List[str], screenshot_folder: str):
main_content.screenshot(new_icons_path);

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

# crop the div out from the screenshot
icon_screenshot = str(
Path(screenshot_folder, f"new_icon_{len_ - i}.png").resolve()
Path(screenshot_folder, f"new_icon_{i}.png").resolve()
)
icon_div.screenshot(icon_screenshot)
i += 1

print("Finished peeking the icons...")
2 changes: 1 addition & 1 deletion .github/workflows/build_icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: >
python ./.github/scripts/icomoon_build.py
./.github/scripts/build_assets/geckodriver-v0.27.0-win64/geckodriver.exe ./icomoon.json
./.github/scripts/build_assets/geckodriver-v0.29.1-win64/geckodriver.exe ./icomoon.json
./devicon.json ./icons ./ %GITHUB_TOKEN% --headless
- name: Upload geckodriver.log for debugging purposes
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/peek_icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
shell: cmd
run: >
python ./.github/scripts/icomoon_peek.py
./.github/scripts/build_assets/geckodriver-v0.27.0-win64/geckodriver.exe ./icomoon.json
./.github/scripts/build_assets/geckodriver-v0.29.1-win64/geckodriver.exe ./icomoon.json
./devicon.json ./icons ./ --headless --pr_title "%PR_TITLE%"
- name: Upload the err messages (created by icomoon_peek.py)
Expand Down
7 changes: 5 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ First of all, thanks for taking the time to contribute! This project can only gr
<li><a href="#example">Example of Submitting An Icon</a></li>
<li><a href="#updatingIcons">Updating an Icon</a></li>
<li><a href="#teams">Maintainer/Reviewer/Teams</a></li>
<li><a href="#buildScript">Our Workflows: how they work and their issues</a></li>
<li><a href="#buildScript">Our Workflows: how they work</a></li>
<li><a href="#bugs">Common Bugs and Solutions</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 @@ -411,6 +412,8 @@ As an example, let's assume you have created the SVGs for Redhat and Amazon Web
<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>
</ul>

<hr>
<h2 id='bugs'>Common Bugs and Solutions</h2>
<p>There are some bugs that the build scripts might run into. Listed below are the common ones and their solutions</p>
<ol>
<li><b>No connection could be made because the target machine actively refused it. (os error 10061)</b>
Expand All @@ -437,7 +440,7 @@ As an example, let's assume you have created the SVGs for Redhat and Amazon Web
<ul>
<li>See <a href="https://github.com/devicons/devicon/pull/532">this PR</a>'s peek result.</li>
<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>
<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>
<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>
</ul>
</li>
</ol>
Expand Down
Loading

0 comments on commit 2ae2a90

Please sign in to comment.