Skip to content

Commit 0e56598

Browse files
authored
Merge pull request #376 from devicons/develop
Release develop in master (fix build process)
2 parents ca0eb3d + b745708 commit 0e56598

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/build_icons.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
if: ${{ success() }}
4343
uses: peter-evans/create-pull-request@v3
4444
with:
45-
branch: ${{ format('build/{0}', github.head_ref) }}
46-
base: 'develop'
45+
branch: 'master-build-result'
46+
base: 'master'
4747
commit-message: 'Built new icons, icomoon.json and devicon.css'
4848
title: 'bot:build new icons, icomoon.json and devicon.css'
4949
body: 'Automated font-building task ran by GitHub Actions bot'

devicon.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,12 +1105,17 @@
11051105
"original-wordmark"
11061106
],
11071107
"font": [
1108-
"plain",
1109-
"plain-wordmark"
1108+
"original",
1109+
"original-wordmark"
11101110
]
11111111
},
11121112
"color": "#181616",
1113-
"aliases": []
1113+
"aliases": [
1114+
{
1115+
"base": "original",
1116+
"alias": "plain"
1117+
}
1118+
]
11141119
},
11151120
{
11161121
"name": "gitlab",
@@ -2952,4 +2957,4 @@
29522957
"color": "#68b604",
29532958
"aliases": []
29542959
}
2955-
]
2960+
]

0 commit comments

Comments
 (0)