Skip to content

Commit

Permalink
Merge branch 'main' into nuxt
Browse files Browse the repository at this point in the history
  • Loading branch information
PKief committed Nov 20, 2023
2 parents d21c50f + 4eb3742 commit 4529d1c
Show file tree
Hide file tree
Showing 32 changed files with 209 additions and 22 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,21 @@ jobs:

steps:
- name: Checkout 🛎
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Node.js ${{ matrix.node-version }} ⚙
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Run display server 🖥
run: /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & echo "Started xvfb"
shell: bash
if: ${{ success() && matrix.os == 'ubuntu-latest' }}

- name: Install node_modules 📦
run: npm ci

- name: Cache node_modules 💾
uses: actions/cache@v3
env:
Expand All @@ -37,6 +41,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
${{ runner.os }}-build-
${{ runner.os }}-
- name: Test + Build 🚀
run: |
npm test
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/color-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ jobs:
TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Check colors 🎨
run: |
svgFiles=$(git diff origin/${{ env.TARGET_BRANCH }} --diff-filter=ACMRTUX --name-only | grep '.svg$')
Expand Down
63 changes: 63 additions & 0 deletions .github/workflows/icon-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Icon Review

on:
pull_request_target:
paths:
- 'icons/*.svg'

jobs:
icon-review:
name: Icon Review
runs-on: ubuntu-latest
env:
TARGET_BRANCH: ${{ github.event.pull_request.base.ref }}
steps:
- name: Checkout Fork 🛎️
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
fetch-depth: 0
path: fork

- name: Checkout Original 🛎️
uses: actions/checkout@v4
with:
fetch-depth: 0
path: main

- name: Review SVG files 🔍
run: |
cd main
svgFiles=$(git diff --no-index ../main ../fork --diff-filter=ACMRTUX --name-only | grep '.svg$')
echo "SVG files changed: ${svgFiles}"
npx svg-icon-review ${svgFiles}
- name: Install jq ⚙️
run: sudo apt-get install jq

- name: Upload PNG ⬆️
env:
IMAGE_UPLOAD: ${{ secrets.IMAGE_UPLOAD }}
id: upload
run: |
IMAGE_URL=$(curl --location 'https://freeimage.host/json' --form 'source=@"./main/preview.png"' --form 'type="file"' --form 'action="upload"' --form 'auth_token="${{env.IMAGE_UPLOAD}}"' | jq -r '.image.url')
echo image_url=$IMAGE_URL >> $GITHUB_ENV
shell: bash

- name: Post review in PR ✍️
uses: actions/github-script@v7
with:
script: |
const image_url = "${{ env.image_url }}";
console.log('URL: '+image_url);
const commentBody = '## Preview \n\nThank you for creating a pull request. This preview shows you how your changes will look on the different themes: \n\n ![Generated Preview](' + image_url + ') \n\n You can find more information how to contribute in the [contribution guidelines](https://github.com/PKief/vscode-material-icon-theme/blob/main/CONTRIBUTING.md).';
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: commentBody
})
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26 changes: 26 additions & 0 deletions .github/workflows/pr-closed.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: PR closed

on:
pull_request_target:
types:
- closed

jobs:
thank_you:
runs-on: ubuntu-latest
if: github.event.pull_request.merged == true
steps:
- name: Post Thank You Comment 🙏
uses: actions/github-script@v7
with:
script: |
github.rest.issues.createComment({
issue_number: context.issue.number,
owner: context.repo.owner,
repo: context.repo.repo,
body: `## Merge Successful
Thanks for your contribution! 🎉
The changes will be part of the upcoming update on the marketplace.`
})
12 changes: 11 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,28 @@ jobs:
VERSION_CHANGE: ${{ github.event.inputs.versionChange }}
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Setup Node.js ⚙️
uses: actions/setup-node@v3
with:
node-version: 'lts/*'
registry-url: 'https://registry.npmjs.org'

- name: Install node_modules 📦
run: |
npm ci
npm install --global @vscode/vsce
- name: Update version ↗
run: |
git config --global user.name 'Philipp Kief'
git config --global user.email 'PKief@users.noreply.github.com'
git config --global push.followTags true
npm version ${{ env.VERSION_CHANGE }} -m "Release %s"
- name: Get meta data 🔍
run: |
NODE_VERSION=$(node -p -e "require('./package.json').version")
Expand All @@ -45,28 +49,34 @@ jobs:
echo NAME=$NODE_NAME >> $GITHUB_ENV
NODE_DISPLAY_NAME=$(node -p -e "require('./package.json').displayName")
echo DISPLAY_NAME=$NODE_DISPLAY_NAME >> $GITHUB_ENV
- name: Build ⚒️
run: vsce package

- name: Push tags 📌
run: git push

- name: Release ${{ env.VERSION }} 🔆
uses: softprops/action-gh-release@v1
with:
files: ${{ env.NAME }}-${{ env.VERSION }}.vsix
tag_name: v${{ env.VERSION }}
name: ${{ env.DISPLAY_NAME }} v${{ env.VERSION }}
generate_release_notes: true

- name: Publish to Open VSX Registry 🌐
uses: HaaLeo/publish-vscode-extension@v1
with:
pat: ${{ secrets.OPEN_VSX_TOKEN }}
extensionFile: ${{ env.NAME }}-${{ env.VERSION }}.vsix

- name: Publish to Visual Studio Marketplace 🌐
uses: HaaLeo/publish-vscode-extension@v1
with:
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
registryUrl: https://marketplace.visualstudio.com
extensionFile: ${{ env.NAME }}-${{ env.VERSION }}.vsix

- name: Publish to NPM Registry 🌐
run: npm publish
env:
Expand Down
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@
All notable changes to this project will be documented in this file. Dates are displayed in UTC.


#### [v4.32.0](https://github.com/PKief/vscode-material-icon-theme/compare/v4.31.0...v4.32.0)

> November 20, 2023
- [Icon Request] HJSON file icon [`#2136`](https://github.com/PKief/vscode-material-icon-theme/pull/2136)
- Update workflow files [`d5912bb`](https://github.com/PKief/vscode-material-icon-theme/commit/d5912bb)
- Add Google App Script (*.gs) file icon [`#2143`](https://github.com/PKief/vscode-material-icon-theme/pull/2143)
- build(deps-dev): bump axios from 1.4.0 to 1.6.0 [`#2141`](https://github.com/PKief/vscode-material-icon-theme/pull/2141)
- Added Lottie Folder Icons aswell as the File Icon. [`#2073`](https://github.com/PKief/vscode-material-icon-theme/pull/2073)
- [Icon Request] Add more textlintrc file names [`#2137`](https://github.com/PKief/vscode-material-icon-theme/pull/2137)
- Update Angular icons [`#2134`](https://github.com/PKief/vscode-material-icon-theme/pull/2134)
- Added mjs extension for stylelint [`#2129`](https://github.com/PKief/vscode-material-icon-theme/pull/2129)
- Add history icon association [`71173fc`](https://github.com/PKief/vscode-material-icon-theme/commit/71173fc)
- [Icon Request] Taskfile [`#1739`](https://github.com/PKief/vscode-material-icon-theme/pull/1739)
- [Icon Request] ABAP [`#2123`](https://github.com/PKief/vscode-material-icon-theme/pull/2123)
- Associate .whitesource file name with json file [`04e6cce`](https://github.com/PKief/vscode-material-icon-theme/commit/04e6cce)
- feat: add tailwind config esm [`#2112`](https://github.com/PKief/vscode-material-icon-theme/pull/2112)

#### [v4.31.0](https://github.com/PKief/vscode-material-icon-theme/compare/v4.30.1...v4.31.0)

> October 6, 2023
Expand Down
3 changes: 3 additions & 0 deletions icons/abap.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/angular-component.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/angular-directive.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/angular-guard.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/angular-pipe.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/angular-resolver.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/angular-service.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/angular.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/apps-script.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/folder-angular-open.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/folder-angular.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/folder-lottie-open.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/folder-lottie.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-taskfile-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-taskfile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4529d1c

Please sign in to comment.