From 6949b4946bb379d8e0db884008685227ad0a7aff Mon Sep 17 00:00:00 2001
From: Henry Gabryjelski <henrygab@users.noreply.github.com>
Date: Sun, 19 Dec 2021 22:51:00 -0800
Subject: [PATCH 1/3] Faster builds -- better error messaging

---
 .github/workflows/build.yml | 25 +++++++++++++++++++++++--
 ci/build-platformio.sh      |  7 ++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c8cf2b64..32c00704 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,13 +10,34 @@ jobs:
       - name: Build with Arduino-CLI
         run: bash ci/build-arduino.sh
 
-  pio-build:
+  pio-builds:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        product:
+          - fastled_webserver
+          - esp_thing
+          - kraken64
+          - chamaeleon64
+          - 1628_rings
+          - fib1024
+          - fib512
+          - fib256
+          - fib128
+          - fib64_full
+          - fib64_mini
+          - fib32
+        platform:
+          - d1_mini
+          # - mini32 # When ESP32 is supported, one-line change to enable 2x product builds
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Build with PlatformIO
+      - name: Build
+        env:
+          FIB_PRODUCT: ${{ matrix.product }}__${{ matrix.platform }}
         run: bash ci/build-platformio.sh
 
       - uses: actions/upload-artifact@v2
diff --git a/ci/build-platformio.sh b/ci/build-platformio.sh
index 5802536a..03d55c30 100644
--- a/ci/build-platformio.sh
+++ b/ci/build-platformio.sh
@@ -15,4 +15,9 @@ python3 get-platformio.py
 pio platform install "espressif8266"
 
 # Compile project
-pio run
+if [[ ! -v FIB_PRODUCT ]]; then
+    pio run
+else
+    pio run --environment ${FIB_PRODUCT}
+fi
+

From 72acd3a496b7d9717438d21ce422d2a299fb3c0f Mon Sep 17 00:00:00 2001
From: Henry Gabryjelski <henrygab@users.noreply.github.com>
Date: Sun, 19 Dec 2021 23:45:45 -0800
Subject: [PATCH 2/3] Also save elf file (debugging info)

---
 .github/workflows/build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32c00704..55de4051 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,4 +43,6 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: firmware
-          path: .pio/build/*/firmware.bin
+          path: |
+            .pio/build/*/firmware.bin
+            .pio/build/*/firmware.elf

From 390fbc033b445c44fd7c27a8b4c002366cf76989 Mon Sep 17 00:00:00 2001
From: Henry Gabryjelski <henrygab@users.noreply.github.com>
Date: Sun, 19 Dec 2021 23:51:18 -0800
Subject: [PATCH 3/3] Generate/save the file system for each image.

---
 .github/workflows/build.yml | 1 +
 ci/build-platformio.sh      | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55de4051..d26842db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,3 +46,4 @@ jobs:
           path: |
             .pio/build/*/firmware.bin
             .pio/build/*/firmware.elf
+            .pio/build/*/littlefs.bin
diff --git a/ci/build-platformio.sh b/ci/build-platformio.sh
index 03d55c30..40e77a3d 100644
--- a/ci/build-platformio.sh
+++ b/ci/build-platformio.sh
@@ -17,7 +17,8 @@ pio platform install "espressif8266"
 # Compile project
 if [[ ! -v FIB_PRODUCT ]]; then
     pio run
+    pio run --target buildfs
 else
     pio run --environment ${FIB_PRODUCT}
+    pio run --target buildfs --environment ${FIB_PRODUCT}
 fi
-