1
0
mirror of https://github.com/konpa/devicon.git synced 2025-08-20 05:11:37 +02:00

Merge pull request #376 from devicons/develop

Release develop in master (fix build process)
This commit is contained in:
Clemens Bastian
2020-12-08 23:41:05 +01:00
committed by GitHub
2 changed files with 11 additions and 6 deletions

View File

@@ -42,8 +42,8 @@ jobs:
if: ${{ success() }} if: ${{ success() }}
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v3
with: with:
branch: ${{ format('build/{0}', github.head_ref) }} branch: 'master-build-result'
base: 'develop' base: 'master'
commit-message: 'Built new icons, icomoon.json and devicon.css' commit-message: 'Built new icons, icomoon.json and devicon.css'
title: 'bot:build new icons, icomoon.json and devicon.css' title: 'bot:build new icons, icomoon.json and devicon.css'
body: 'Automated font-building task ran by GitHub Actions bot' body: 'Automated font-building task ran by GitHub Actions bot'

View File

@@ -1105,12 +1105,17 @@
"original-wordmark" "original-wordmark"
], ],
"font": [ "font": [
"plain", "original",
"plain-wordmark" "original-wordmark"
] ]
}, },
"color": "#181616", "color": "#181616",
"aliases": [] "aliases": [
{
"base": "original",
"alias": "plain"
}
]
}, },
{ {
"name": "gitlab", "name": "gitlab",
@@ -2952,4 +2957,4 @@
"color": "#68b604", "color": "#68b604",
"aliases": [] "aliases": []
} }
] ]