Skip to content

Commit

Permalink
Merge branch 'main' into PKief/issue2804
Browse files Browse the repository at this point in the history
  • Loading branch information
PKief authored Jan 17, 2025
2 parents c5b9f1a + 0b0e930 commit 5bc4f0f
Show file tree
Hide file tree
Showing 13 changed files with 62 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .bun-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.43
1.1.45
24 changes: 0 additions & 24 deletions .github/scripts/update-status-label.sh

This file was deleted.

5 changes: 4 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ jobs:
- name: 🏷️ Manage label based on build result
if: ${{ always() && github.event_name == 'pull_request' }}
run: .github/scripts/update-status-label.sh ${{ github.event.pull_request.number }} ${{ steps.build.outcome }} "❌ failed build"
uses: material-extensions/add-labels@60e0e247ae419e306ff73fff891bbf9bcf7d85c4 # v1.0.5
with:
labels: "❌ failed build"
action: ${{ steps.build.outcome == 'failure' && 'add' || 'remove' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 4 additions & 2 deletions .github/workflows/color-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jobs:
with:
sparse-checkout-cone-mode: false
sparse-checkout: |
.github/scripts/update-status-label.sh
material-colors.yml
icons/
Expand All @@ -41,6 +40,9 @@ jobs:
- name: 🏷️ Manage label based on color check result
if: always()
run: .github/scripts/update-status-label.sh ${{ github.event.pull_request.number }} ${{ steps.color-check.outcome }} "🎨 invalid colors"
uses: material-extensions/add-labels@60e0e247ae419e306ff73fff891bbf9bcf7d85c4 # v1.0.5
with:
labels: "🎨 invalid colors"
action: ${{ steps.color-check.outcome == 'failure' && 'add' || 'remove' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
39 changes: 0 additions & 39 deletions .github/workflows/potential-duplicates.yml

This file was deleted.

22 changes: 6 additions & 16 deletions .github/workflows/pr-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,13 @@ permissions:

jobs:
thank-you:
runs-on: ubuntu-latest

if: github.event.pull_request.merged == true

steps:
- name: 🙏 Post Thank You Comment
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `
## Merge Successful
uses: material-extensions/workflows/.github/workflows/pr-closed.yml@main
with:
comment: |
## Merge Successful
Thanks for your contribution! 🎉
Thanks for your contribution! 🎉
The changes will be part of the upcoming update on the Marketplace.`
})
The changes will be part of the upcoming update on the Marketplace.
32 changes: 3 additions & 29 deletions .github/workflows/pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,8 @@ permissions:

jobs:
lint-pr-title:
name: Check PR Title

runs-on: ubuntu-latest

if: ${{ github.event.action == 'opened' || github.event.changes.title != null }}

steps:
- name: 📥 Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
# Only fetch the config file from the repository
sparse-checkout-cone-mode: false
sparse-checkout: |
.github/scripts/update-status-label.sh
commitlint.config.js
- name: 📦 Install dependencies
run: npm install --global @commitlint/config-conventional commitlint

- name: 🔍 Check PR title with commitlint
id: title-check
env:
PR_TITLE: ${{ github.event.pull_request.title }}
HELP_URL: https://github.com/material-extensions/vscode-material-icon-theme/blob/main/CONTRIBUTING.md#conventional-pull-request-titles
run: echo "$PR_TITLE" | npx commitlint --help-url $HELP_URL

- name: 🏷️ Manage label based on PR title check result
if: always()
run: .github/scripts/update-status-label.sh ${{ github.event.pull_request.number }} ${{ steps.title-check.outcome }} "🔤 invalid title"
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: material-extensions/workflows/.github/workflows/pr-title.yml@main
with:
commitlint-help-url: https://github.com/material-extensions/vscode-material-icon-theme/blob/main/CONTRIBUTING.md#conventional-pull-request-titles
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ It is always welcome to add new icons to the extension. However, there are a few

```mermaid
flowchart LR
B{Shape already exists\nwith different colors?}
B{Shape already exists<br>with different colors?}
B ---->|No| E
B ---->|Yes| C
C[<a href="#cloning-workflow">Cloning Workflow</a>]
Expand Down Expand Up @@ -101,7 +101,7 @@ These free tools are recommended to create or edit new SVG icons:
- [Inkscape](https://inkscape.org/en/) is a free, open source SVG editor
- There are tools available to convert PNG/JPG images to SVG - [Autotracer.org](https://autotracer.org) and [Vectorizer.io](https://vectorizer.io) are two examples.

> **Note**
> [!NOTE]
> It's important to produce fully _vectorized_ graphic (don't include a base64 image string in the svg).
When you create a folder icon, please keep in mind that two SVG files are needed here: one that represents the folder closed and another that represents it open.
Expand Down Expand Up @@ -132,7 +132,7 @@ bun run check-colors

Installation of the dependencies is necessary before running the command, see [Debug extension locally](#debug-extension-locally).

> **Note**
> [!NOTE]
> The colors black (`#000000`) and white (`#ffffff`) are not allowed in the icons. These colors have too much contrast and do not fit into the overall picture of the icons.
Continue reading [here](#design-folder-icons) to find out about colors for the folder icons.
Expand Down Expand Up @@ -226,7 +226,7 @@ Here's an example of how a folder icon can be assigned to folder icons:

This will apply a folder icon for the folders 'sample' and 'samples'.

> **Note**
> [!NOTE]
> The tool automatically creates generic "wildcard" variants of these folders, so only assign the base names. The current wildcards are the following: `.sample`, `_sample`, `__sample__`.
#### Root folder icons
Expand Down Expand Up @@ -494,5 +494,5 @@ The available log levels are:

Per default the logging is disabled as it can slow down the extension. If logging is enabled, the logs can be found in the output panel of VS Code under "Material Icon Theme".

> **Note**
> [!NOTE]
> Please restart the extension after changing the logging settings to apply the changes.
26 changes: 26 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Security Policy

## Supported Versions

| Version | Supported |
|---------|--------------------|
| Latest | :white_check_mark: |
| Older | :x: |

We provide security updates exclusively for the latest version of the project. Older versions are considered outdated once a new version is released and will not receive support.

## Reporting a Vulnerability

If you discover a security issue, please report it privately using the following method:

- **Email:** [[email protected]](mailto:[email protected])
- Provide:
- A description of the issue.
- Steps to reproduce it.
- The potential impact.

We will review your report and respond with any necessary actions. Thank you for your responsible disclosure.

## Additional Resources

- [GitHub Security Advisories](https://docs.github.com/en/code-security/security-advisories)
4 changes: 4 additions & 0 deletions icons/folder-repository-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/folder-repository.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion icons/github-sponsors.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/core/icons/folderIcons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,10 @@ export const folderIcons: FolderTheme[] = [
name: 'folder-powershell',
folderNames: ['powershell', 'ps', 'ps1'],
},
{
name: 'folder-repository',
folderNames: ['repository', 'repositories', 'repo', 'repos'],
},
{
name: 'folder-luau',
folderNames: ['luau'],
Expand Down

0 comments on commit 5bc4f0f

Please sign in to comment.