From a02de6e94680d1e52123b2b1b378daea88ab6572 Mon Sep 17 00:00:00 2001
From: Andy Kluger <AndyKluger@gmail.com>
Date: Fri, 15 Dec 2023 00:37:40 -0500
Subject: [PATCH] Test defaults git pkg build, webfonts on

---
 .github/workflows/buildpkg.yml | 44 ++++------------------------------
 vars.nt                        | 10 ++++----
 2 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/buildpkg.yml b/.github/workflows/buildpkg.yml
index 3901dcf..4140237 100644
--- a/.github/workflows/buildpkg.yml
+++ b/.github/workflows/buildpkg.yml
@@ -37,49 +37,13 @@ jobs:
       - name: render PKGBUILDs
         run: ./mk/pkgbuilds.sh
 
-      - name: copy ttf-iosevka-custom-git PKGBUILD into build ctnr
+      - name: copy ttf-iosevka-git PKGBUILD into build ctnr
         run: |
-          buildah copy --chown dev ctnr pkgs/ttf-iosevka-custom-git /home/dev/ttf-iosevka-custom-git
+          buildah copy --chown dev ctnr pkgs/ttf-iosevka-git /home/dev/ttf-iosevka-git
 
-      - name: build and siphon ttf-iosevka-custom-git from build ctnr
+      - name: build and siphon ttf-iosevka-git from build ctnr
         run: |
-          buildah config -u dev --workingdir /home/dev/ttf-iosevka-custom-git ctnr
-          buildah run ctnr makepkg --noconfirm -s
-
-          buildah run ctnr ls -lh
-
-          pkg="$(buildah run ctnr sh -c "printf '%s\n' *.pkg.*")"
-          mkdir -p "${RUNNER_TEMP}/dist"
-          buildah run ctnr cat "$pkg" >"${RUNNER_TEMP}/dist/${pkg}"
-
-          printf '%s\n' "${RUNNER_TEMP}/dist/"
-          ls -lh "${RUNNER_TEMP}/dist/"
-
-      - name: copy ttf-iosevka-term-custom-git PKGBUILD into build ctnr
-        run: |
-          buildah copy --chown dev ctnr pkgs/ttf-iosevka-term-custom-git /home/dev/ttf-iosevka-term-custom-git
-
-      - name: build and siphon ttf-iosevka-term-custom-git from build ctnr
-        run: |
-          buildah config -u dev --workingdir /home/dev/ttf-iosevka-term-custom-git ctnr
-          buildah run ctnr makepkg --noconfirm -s
-
-          buildah run ctnr ls -lh
-
-          pkg="$(buildah run ctnr sh -c "printf '%s\n' *.pkg.*")"
-          mkdir -p "${RUNNER_TEMP}/dist"
-          buildah run ctnr cat "$pkg" >"${RUNNER_TEMP}/dist/${pkg}"
-
-          printf '%s\n' "${RUNNER_TEMP}/dist/"
-          ls -lh "${RUNNER_TEMP}/dist/"
-
-      - name: copy ttf-iosevka-quasi-proportional-custom-git PKGBUILD into build ctnr
-        run: |
-          buildah copy --chown dev ctnr pkgs/ttf-iosevka-quasi-proportional-custom-git /home/dev/ttf-iosevka-quasi-proportional-custom-git
-
-      - name: build and siphon ttf-iosevka-quasi-proportional-custom-git from build ctnr
-        run: |
-          buildah config -u dev --workingdir /home/dev/ttf-iosevka-quasi-proportional-custom-git ctnr
+          buildah config -u dev --workingdir /home/dev/ttf-iosevka-git ctnr
           buildah run ctnr makepkg --noconfirm -s
 
           buildah run ctnr ls -lh
diff --git a/vars.nt b/vars.nt
index e4c2b50..80fa24c 100644
--- a/vars.nt
+++ b/vars.nt
@@ -1,9 +1,9 @@
 build:
   # Uncomment the ones you wish to build
-  - ttf-iosevka-custom-git
-  - ttf-iosevka-term-custom-git
-  - ttf-iosevka-quasi-proportional-custom-git
-  # - ttf-iosevka-git
+  # - ttf-iosevka-custom-git
+  # - ttf-iosevka-term-custom-git
+  # - ttf-iosevka-quasi-proportional-custom-git
+  - ttf-iosevka-git
   # - ttf-iosevka-fixed-custom-git
   # - ttf-iosevka-fontconfig-mono-custom-git
   # - ttf-iosevka-quasi-proportional-extension-only-custom-git
@@ -21,7 +21,7 @@ spacings:
   # ^ non-mono
   - quasi-proportional-extension-only
   # ^ non-mono without making anything narrower (e.g. "i" is still wide)
-build_webfonts: no
+build_webfonts: yes
 use_custom_weights: yes
 contextual_widths: yes
 branch: dev