From 99ed44cbf7e597b59d22b5cce4cec82a0934b0f0 Mon Sep 17 00:00:00 2001
From: Clemens Bastian <8781699+amacado@users.noreply.github.com>
Date: Thu, 3 Dec 2020 16:58:45 +0100
Subject: [PATCH 1/2] static branch name for build

since we are only triggering this action manually when a new release should be made we need to specify a fixed name for the resulting branch
---
 .github/workflows/build_icons.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_icons.yml b/.github/workflows/build_icons.yml
index 2f6e69d1..2719cce7 100644
--- a/.github/workflows/build_icons.yml
+++ b/.github/workflows/build_icons.yml
@@ -42,8 +42,8 @@ jobs:
         if: ${{ success() }}
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: ${{ format('build/{0}', github.head_ref) }}
-          base: 'develop'
+          branch: 'master-build-result'
+          base: 'master'
           commit-message: 'Built 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'

From 449157e2959e17e497f8db467e2db366a7394105 Mon Sep 17 00:00:00 2001
From: Clemens Bastian <8781699+amacado@users.noreply.github.com>
Date: Mon, 7 Dec 2020 22:17:39 +0100
Subject: [PATCH 2/2] fix github font version and add alias

as reported in issue #373 github font is saved as original but the devicon.json is referencing the non-existing plain version
---
 devicon.json | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/devicon.json b/devicon.json
index 418d0217..71d05136 100644
--- a/devicon.json
+++ b/devicon.json
@@ -1105,12 +1105,17 @@
                 "original-wordmark"
             ],
             "font": [
-                "plain",
-                "plain-wordmark"
+                "original",
+                "original-wordmark"
             ]
         },
         "color": "#181616",
-        "aliases": []
+        "aliases": [
+            {
+                "base": "original",
+                "alias": "plain"
+            }
+        ]
     },
     {
         "name": "gitlab",
@@ -2952,4 +2957,4 @@
         "color": "#68b604",
         "aliases": []
     }
-]
\ No newline at end of file
+]