From c1d81cdda829dcfa6b447e3c0022bc141fe3558c Mon Sep 17 00:00:00 2001
From: Ryan L McIntyre <ryanoasis@users.noreply.github.com>
Date: Sat, 1 Jan 2022 07:50:03 -0800
Subject: [PATCH] Tweak RC for less fonts and try wildcard pattern for artifact
 upload, comments out commit for now

---
 .github/workflows/release.yml           | 15 ++++++------
 bin/scripts/lib/fonts-small-subset.json | 32 -------------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 76ce9e886..2fb046a61 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -155,7 +155,7 @@ jobs:
         uses: actions/upload-artifact@v2
         with:
           name: patched-fonts
-          path: "patched-fonts/${{ matrix.font }}"
+          path: "$GITHUB_WORKSPACE/patched-fonts/*/${{ matrix.font }}"
 
   commit:
     name: Commit and push patched fonts to the repo
@@ -173,9 +173,10 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
 
-      - uses: EndBug/add-and-commit@v7
-        with:
-          add: 'patched-fonts'
-          message: Rebuilds patched fonts
-          committer_name: GitHub Actions
-          committer_email: 41898282+github-actions[bot]@users.noreply.github.com
\ No newline at end of file
+      # uncommment once structure is correct
+      # - uses: EndBug/add-and-commit@v7
+      #   with:
+      #     add: 'patched-fonts'
+      #     message: Rebuilds patched fonts
+      #     committer_name: GitHub Actions
+      #     committer_email: 41898282+github-actions[bot]@users.noreply.github.com
\ No newline at end of file
diff --git a/bin/scripts/lib/fonts-small-subset.json b/bin/scripts/lib/fonts-small-subset.json
index 1652a9ba5..166a9b8a1 100644
--- a/bin/scripts/lib/fonts-small-subset.json
+++ b/bin/scripts/lib/fonts-small-subset.json
@@ -1,13 +1,5 @@
 {
   "fonts": [
-    {
-      "unpatchedName": "3270",
-      "patchedName": "3270",
-      "folderName": "3270",
-      "imagePreviewFont": "3270 Nerd Font",
-      "linkPreviewFont": "font3270",
-      "description": "derived from the x3270 font, a modern format of a font with high nostalgic value"
-    },
     {
       "unpatchedName": "Agave",
       "patchedName": "Agave",
@@ -16,14 +8,6 @@
       "linkPreviewFont": "agave",
       "description": "A small, monospace, outline font that is geometrically regular and simple"
     },
-    {
-      "unpatchedName": "Cascadia Code",
-      "patchedName": "Caskaydia Cove",
-      "folderName": "CascadiaCode",
-      "imagePreviewFont": "Caskaydia Cove Nerd Font",
-      "linkPreviewFont": "cascadia-code",
-      "description": "A fun, new monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"
-    },
     {
       "unpatchedName": "Hack",
       "patchedName": "Hack",
@@ -32,22 +16,6 @@
       "linkPreviewFont": "hack",
       "description": "dotted zero, short descenders, expands upon work done for Bitstream Vera &amp; DejaVu, legible at common sizes"
     },
-    {
-      "unpatchedName": "JetBrainsMono",
-      "patchedName": "JetBrainsMono",
-      "folderName": "JetBrainsMono",
-      "imagePreviewFont": "JetBrainsMono Nerd Font",
-      "linkPreviewFont": "jetbrainsmono",
-      "description": "JetBrains officially created font for developers"
-    },
-    {
-      "unpatchedName": "ShareTechMono",
-      "patchedName": "ShureTechMono",
-      "folderName": "ShareTechMono",
-      "imagePreviewFont": "ShureTechMono Nerd Font",
-      "linkPreviewFont": "share-tech",
-      "description": "dotted zeros, distinguishable 1 and l, curved and straight character lines"
-    },
     {
       "unpatchedName": "Symbols Template 1000 EM",
       "patchedName": "Symbols-1000-em Nerd Font Complete",