⏪ revert: "✅ hotfix: remove "j" orthography temporarily"

This reverts commit d398e8e.
jonz94 · May 6, 2024 · 8d8867c · 8d8867c
1 parent e09ca35
commit 8d8867c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/.github/workflows/generate-fonts.yml b/.github/workflows/generate-fonts.yml
@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         styles: ['fixed', 'fixed-slab', 'mono', 'mono-slab']
-        orthographies: ['cl', 'hc', 'k', 'sc', 'tc']
+        orthographies: ['cl', 'hc', 'j', 'k', 'sc', 'tc']
         variants:
           [
             'regular',
@@ -173,7 +173,7 @@ jobs:
     strategy:
       matrix:
         styles: ['term', 'term-slab', 'gothic', 'ui']
-        orthographies: ['cl', 'hc', 'k', 'sc', 'tc']
+        orthographies: ['cl', 'hc', 'j', 'k', 'sc', 'tc']
         variants:
           [
             'regular',
@@ -292,7 +292,7 @@ jobs:
     strategy:
       matrix:
         styles: ['fixed', 'fixed-slab', 'mono', 'mono-slab', 'term', 'term-slab', 'gothic', 'ui']
-        orthographies: ['cl', 'hc', 'k', 'sc', 'tc']
+        orthographies: ['cl', 'hc', 'j', 'k', 'sc', 'tc']
     steps:
       # start of part generated by `generate-download-patched-fonts` script
       - uses: actions/download-artifact@v4
@@ -351,6 +351,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-fixed-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-fixed-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-fixed-k-nerd-font.zip
@@ -366,6 +369,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-fixed-slab-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-fixed-slab-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-fixed-slab-k-nerd-font.zip
@@ -381,6 +387,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-mono-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-mono-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-mono-k-nerd-font.zip
@@ -396,6 +405,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-mono-slab-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-mono-slab-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-mono-slab-k-nerd-font.zip
@@ -411,6 +423,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-term-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-term-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-term-k-nerd-font.zip
@@ -426,6 +441,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-term-slab-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-term-slab-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-term-slab-k-nerd-font.zip
@@ -441,6 +459,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-gothic-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-gothic-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-gothic-k-nerd-font.zip
@@ -456,6 +477,9 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-ui-hc-nerd-font.zip
+      - uses: actions/download-artifact@v4
+        with:
+          name: sarasa-ui-j-nerd-font.zip
       - uses: actions/download-artifact@v4
         with:
           name: sarasa-ui-k-nerd-font.zip

diff --git a/scripts/generate-download-patched-zips.ps1 b/scripts/generate-download-patched-zips.ps1
@@ -4,12 +4,10 @@ Clear-Content $outputFile
 
 $counter = 0
 $styles = "fixed", "fixed-slab", "mono", "mono-slab", "term", "term-slab", "gothic", "ui"
+$orthographies = "cl", "hc", "j", "k", "sc", "tc"
 
-# $orthographies = "cl", "hc", "j", "k", "sc", "tc"
-$orthographies = "cl", "hc", "k", "sc", "tc"
-
-foreach ($style in $styles) {
-  foreach ($orthography in $orthographies) {
+foreach($style in $styles) {
+  foreach($orthography in $orthographies) {
     $uses = '.jobs.job.steps[' + $counter + '].uses = \"actions/download-artifact@v4\"'
     $name = '.jobs.job.steps[' + $counter + '].with.name = \"sarasa-' + $style + '-' + $orthography + '-nerd-font.zip\"'
 

diff --git a/scripts/generate-download-patched-zips.sh b/scripts/generate-download-patched-zips.sh
@@ -6,9 +6,7 @@ touch $outputFile
 
 counter=0
 styles=("fixed" "fixed-slab" "mono" "mono-slab" "term" "term-slab" "gothic" "ui")
-
-#orthographies=("cl" "hc" "j" "k" "sc" "tc")
-orthographies=("cl" "hc" "k" "sc" "tc")
+orthographies=("cl" "hc" "j" "k" "sc" "tc")
 
 for style in ${styles[@]}; do
   for orthography in ${orthographies[@]}; do