Merge branch 'develop' into develop

GCHQDeveloper926 · Apr 14, 2024 · 74404fe · 74404fe
2 parents 87a64a5 + e1a3556
commit 74404fe
Show file tree

Hide file tree

Showing 180 changed files with 14,220 additions and 11,953 deletions.
diff --git a/.github/workflows/build_icons.yml b/.github/workflows/build_icons.yml
@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with: 
-          python-version: 3.8
+          python-version: '3.10'
 
       - name: Install dependencies (python, pip, npm)
         run: |
@@ -17,12 +17,13 @@ jobs:
           npm install
 
       - name: Executing build and create fonts via icomoon
+        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: >
           python ./.github/scripts/icomoon_build.py 
           ./.github/scripts/build_assets/geckodriver-v0.32.2-linux64/geckodriver ./icomoon.json 
-          ./devicon.json ./icons ./ "$GITHUB_TOKEN" --headless
+          ./devicon.json ./icons ./ $GITHUB_TOKEN --headless
 
       - name: Upload geckodriver.log for debugging purposes
         uses: actions/upload-artifact@v2
@@ -42,15 +43,15 @@ jobs:
         if: success() 
         run: npm run build-css
 
-      - name: Upload screenshot of the newly made icons
-        id: imgur_step
-        uses: devicons/public-upload-to-imgur@v2.2.2
-        if: success()
-        with:
-          # will have "new_icons.png" and "new_svgs.png"
-          # in that order (cause sorted alphabetically)
-          path: ./screenshots/*.png
-          client_id: ${{secrets.IMGUR_CLIENT_ID}}
+      # - name: Upload screenshot of the newly made icons
+      #   id: imgur_step
+      #   uses: devicons/public-upload-to-imgur@v2.2.2
+      #   if: success()
+      #   with:
+      #     # will have "new_icons.png" and "new_svgs.png"
+      #     # in that order (cause sorted alphabetically)
+      #     path: ./screenshots/*.png
+      #     client_id: ${{secrets.IMGUR_CLIENT_ID}}
 
       - name: Get the release message from file
         id: release_message_step
@@ -68,22 +69,14 @@ jobs:
 
             I'm Devicon's Build Bot and I just built some new font files and devicon.min.css file.
 
-            Here are all the **SVGs** that were uploaded (the new ones are those with highlight):
-
-            {0}
-
-            Here is what they look like as icons:
-
-            {1}
-
             The devicon.min.css file contains:
             -The icon content
             -The aliases
             -The colored classes
 
             I also compiled a list of new features and icons that were added since last release.
             ```
-            {2}
+            {0}
             ```
 
             More information can be found in the GitHub Action logs for this workflow.
@@ -98,8 +91,6 @@ jobs:
             ${{ 
               format(
                 env.MESSAGE,
-                fromJSON(steps.imgur_step.outputs.markdown_urls)[1],  
-                fromJSON(steps.imgur_step.outputs.markdown_urls)[0],
                 steps.release_message_step.outputs.content
               )
             }}