From be8ddab5ab125e8ea96951d03657243d188e3a26 Mon Sep 17 00:00:00 2001
From: rene-d <rene-d@users.noreply.github.com>
Date: Sat, 7 Mar 2020 22:07:58 +0100
Subject: [PATCH] debug github actions

---
 .github/workflows/platformio.yml | 12 ++++++++----
 .github/workflows/release.yml    |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/platformio.yml b/.github/workflows/platformio.yml
index 4269676..28a0eae 100644
--- a/.github/workflows/platformio.yml
+++ b/.github/workflows/platformio.yml
@@ -21,6 +21,7 @@ jobs:
 
     - name: Install dependencies
       run: |
+        npm install -g html-minifier
         python -m pip install --upgrade pip
         pip install platformio
 
@@ -35,12 +36,15 @@ jobs:
 
     - name: Make artifacts
       run: |
+        mkdir -p zip
         cd .pio/build
-        mkdir -p ../zip
-        zip ../zip/wifinfo-$(git describe).zip $(ls */spiffs.bin */firmware.bin)
+        for i in */spiffs.bin; do mv $i $(dirname $i)/erfs.bin; done
+        zip ../../zip/wifinfo-$(git describe).zip $(ls */spiffs.bin */firmware.bin)
+
+        tools/mkarduinosrc.py -1 arduino.zip
 
     - name: Archive firmware+spiffs
       uses: actions/upload-artifact@v1
       with:
-        name: firmware-spiffs
-        path: .pio/zip/
+        name: firmware-filesystem-arduino
+        path: zip/
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d01a57a..94721c9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,20 +24,20 @@ jobs:
 
       - name: Build project # This would actually build your project, using zip for an example artifact
         run: |
+          npm install -g html-minifier
           python -m pip install --upgrade pip
           pip install platformio
 
           platformio run -e esp01s_prod -e esp12e_prod
           platformio run -e esp01s_prod -e esp12e_prod -t buildfs
 
+          tools/mkarduinosrc.py -1 arduino.zip
+
           cd .pio/build
-          for i in */spiffs.bin; do echo mv $i mv $(dirname $i)/erfs.bin; done
+          for i in */spiffs.bin; do mv $i $(dirname $i)/erfs.bin; done
           zip --junk-paths ../../esp01_1m.zip esp01s_prod/*.bin
           zip --junk-paths ../../esp12e.zip esp12e_prod/*.bin
 
-          cd ../..
-          tools/mkarduinosrc.py arduino.zip
-
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1