Move enable extended globbing into each run

No spaces in the file prefix of Gothic font Don't remove the artifact archives at the end of each step Fix yml globbing again
Radically · Mar 27, 2021 · 2febc2a · 2febc2a
1 parent 64dddca
commit 2febc2a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/.github/workflows/generate-fonts.yml b/.github/workflows/generate-fonts.yml
@@ -52,34 +52,37 @@ jobs:
       - run: sh fetch_svg_font.sh
 
       - run: gzip -d *.txt.gz
-      - run: shopt -s extglob
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Mincho SC
         run: |
           CONFIG=./config_mincho_single.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_mincho.txt ./perl-scripts g
-          zip HanaMinLiteSC.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaMinLiteSC.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Mincho TC CJK
         run: |
           CONFIG=./config_mincho.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_mincho.txt ./perl-scripts t
-          zip HanaMinLiteCJKTC.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaMinLiteCJKTC.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Gothic JP
         run: |
           CONFIG=./config_gothic_single.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_gothic.txt ./perl-scripts j
-          zip HanaGothLiteJP.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaGothLiteJP.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
-      - run: sh clean.sh || exit 0
+      # - run: sh clean.sh || exit 0
       - name: Gothic KR CJK
         run: |
           CONFIG=./config_gothic.json poetry run driver ./glyphwiki_dump/dump_newest_only.txt ./glyphwiki_mincho.txt ./perl-scripts t
-          zip HanaGothLiteCJKKR.zip {Hana*.!(otf),GlyphWiki*}
-          rm {Hana*.!(otf),GlyphWiki*}
+          shopt -s extglob
+          zip HanaGothLiteCJKKR.zip {Hana*.!(*@(otf|zip)),GlyphWiki*}
+          rm {Hana*.!(*@(otf|zip)),GlyphWiki*}
 
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/config_gothic_single.json b/config_gothic_single.json
@@ -5,7 +5,7 @@
   "family_name": "Hanazono Gothic Lite",
   "blocks": {
     "test": {
-      "prefix": "HanaGothLite Test",
+      "prefix": "HanaGothLiteTest",
       "full_name": "Hanazono Gothic Lite Test",
       "unicode_ranges": [
         ["89D0", "89D9"],
@@ -14,12 +14,12 @@
       ]
     },
     "A1": {
-      "prefix": "HanaGothLite A1",
+      "prefix": "HanaGothLiteA1",
       "full_name": "Hanazono Gothic Lite A1",
       "unicode_ranges": [["0000", "ABFF"]]
     },
     "A2": {
-      "prefix": "HanaGothLite A2",
+      "prefix": "HanaGothLiteA2",
       "full_name": "Hanazono Gothic Lite A2",
       "unicode_ranges": [
         ["AC00", "D7FF"],
@@ -28,12 +28,12 @@
       ]
     },
     "B": {
-      "prefix": "HanaGothLite B",
+      "prefix": "HanaGothLiteB",
       "full_name": "Hanazono Gothic Lite B",
       "unicode_ranges": [["20000", "2A6D6"]]
     },
     "C": {
-      "prefix": "HanaGothLite C",
+      "prefix": "HanaGothLiteC",
       "full_name": "Hanazono Gothic Lite C",
       "unicode_ranges": [
         ["2A700", "2FFFD"],