From 70fc9ecc30d2c5129f2073b102d0f8b811b9b2c0 Mon Sep 17 00:00:00 2001
From: Just van Rossum <justvanrossum@gmail.com>
Date: Tue, 16 Jul 2024 08:44:59 +0200
Subject: [PATCH] Export two artifacts: sources and fonts

---
 .github/workflows/build.yml | 12 +++++++++---
 export_and_build.sh         | 24 ++++++++++++------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f7cb29ee..02779f74 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,8 +23,14 @@ jobs:
       - name: Export Fontra and UFO sources and build fonts
         run: ./export_and_build.sh
 
-      - name: Storing Sources Fontra
+      - name: Storing Font Sources
         uses: actions/upload-artifact@v4
         with:
-          name: NotoCJKVarCo_SourcesAndBinaries
-          path: build
+          name: NotoCJKVarCo_Sources
+          path: build/sources
+
+      - name: Storing Font Binaries
+        uses: actions/upload-artifact@v4
+        with:
+          name: NotoCJKVarCo_Fonts
+          path: build/fonts
diff --git a/export_and_build.sh b/export_and_build.sh
index 35ebdde0..6ac8c2b9 100755
--- a/export_and_build.sh
+++ b/export_and_build.sh
@@ -5,18 +5,18 @@ set -x  # echo commands
 
 
 mkdir -p build
-mkdir -p build/fontra
-mkdir -p build/ufo
-mkdir -p build/otf-varc
-mkdir -p build/ttf-varc
-mkdir -p build/otf
-mkdir -p build/ttf
+mkdir -p build/sources/fontra
+mkdir -p build/sources/ufo
+mkdir -p build/fonts/otf-varc
+mkdir -p build/fonts/ttf-varc
+mkdir -p build/fonts/otf
+mkdir -p build/fonts/ttf
 
-fontra-copy notosanscjksc.rcjk build/fontra/notosanscjksc.fontra
-fontra-copy notoserifcjkjp.rcjk build/fontra/notoserifcjkjp.fontra
+fontra-copy notosanscjksc.rcjk build/sources/fontra/notosanscjksc.fontra
+fontra-copy notoserifcjkjp.rcjk build/sources/fontra/notoserifcjkjp.fontra
 
-fontra-copy notosanscjksc.rcjk build/ufo/notosanscjksc.designspace
-fontra-copy notoserifcjkjp.rcjk build/ufo/notoserifcjkjp.designspace
+fontra-copy notosanscjksc.rcjk build/sources/ufo/notosanscjksc.designspace
+fontra-copy notoserifcjkjp.rcjk build/sources/ufo/notoserifcjkjp.designspace
 
-fontra-workflow notosanscjksc.yaml --output-dir build --continue-on-error
-fontra-workflow notoserifcjkjp.yaml --output-dir build --continue-on-error
+fontra-workflow notosanscjksc.yaml --output-dir build/fonts --continue-on-error
+fontra-workflow notoserifcjkjp.yaml --output-dir build/fonts --continue-on-error