Try 4

.github/workflows/compile.yaml

@@ -30,7 +30,6 @@ jobs:
       - name: Make output dir
         run: |
           mkdir -p output
-          mkdir -p _site
       
       - name: Build Binary
         run: |
@@ -39,6 +38,7 @@ jobs:
           cp ./CYD-Klipper-Display/.pio/build/esp32dev/firmware.bin output
           cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin output
           python3 -m esptool --chip esp32 merge_bin -o ./output/merged-firmware.bin --flash_mode dio --flash_freq 40m --flash_size 4MB 0x1000 ./output/bootloader.bin 0x8000 ./output/partitions.bin 0xe000 ./output/boot_app0.bin 0x10000 ./output/firmware.bin
+          cp -r ./output ./_site
 
       - name: Upload artifact 
         uses: actions/upload-artifact@v3
@@ -46,14 +46,6 @@ jobs:
           name: firmware
           path: ./output 
 
-      - name: Make webpage
-        run: |
-          cp -r ./output ./_site
-          python3 generate_manifest.py
-          cp manifest.json ./_site
-          cp manifest_wipe.json ./_site
-          cp index.html ./_site
-
       - name: Upload GitHub Page Artifact
         uses: actions/upload-pages-artifact@v2
 

_site/manifest.json

@@ -0,0 +1,27 @@
+{
+    "name": "CYD-Klipper-Display",
+    "new_install_prompt_erase": false,
+    "builds": [
+        {
+            "chipFamily": "ESP32",
+            "parts": [
+                {
+                    "path": "output/bootloader.bin",
+                    "offset": 4096
+                },
+                {
+                    "path": "output/partitions.bin",
+                    "offset": 32768
+                },
+                {
+                    "path": "output/boot_app0.bin",
+                    "offset": 57344
+                },
+                {
+                    "path": "output/firmware.bin",
+                    "offset": 65536
+                }
+            ]
+        }
+    ]
+}

_site/manifest_wipe.json

@@ -0,0 +1,10 @@
+{
+    "name": "CYD-Klipper-Display",
+    "new_install_prompt_erase": false,
+    "builds": [
+        {
+            "path": "output/merged-firmware.bin",
+            "offset": 0
+        }
+    ]
+}

generate_manifest.py

@@ -1,50 +0,0 @@
-import subprocess, json
-
-latest_tag = subprocess.check_output(["git", "describe", "--tags", "--abbrev=0"])
-
-data_without_wipe = {
-    "name": "CYD-Klipper-Display",
-    "new_install_prompt_erase": False,
-    "version": latest_tag.decode("utf-8").strip(),
-    "builds": [
-        {
-            "chipFamily": "ESP32",
-            "parts": [
-                {
-                    "path": "output/bootloader.bin",
-                    "offset": 4096
-                },
-                {
-                    "path": "output/partitions.bin",
-                    "offset": 32768
-                },
-                {
-                    "path": "output/boot_app0.bin",
-                    "offset": 57344
-                },
-                {
-                    "path": "output/firmware.bin",
-                    "offset": 65536
-                }
-            ]
-        }
-    ]
-}
-
-data_with_wipe = {
-    "name": "CYD-Klipper-Display",
-    "new_install_prompt_erase": False,
-    "version": latest_tag.decode("utf-8").strip(),
-    "builds": [
-        {
-            "path": "output/merged-firmware.bin",
-            "offset": 0
-        }
-    ]
-}
-
-with open("manifest.json", "w") as f:
-    json.dump(data_without_wipe, f, indent=4)
-
-with open("manifest_wipe.json", "w") as f:
-    json.dump(data_with_wipe, f, indent=4)