fix: serve firmware binaries from GitHub Pages with correct paths

chore: force-add v2.0.0 firmware binaries (override .gitignore)

Author: makepkg

.github/workflows/release-firmware.yml

@@ -1,18 +1,22 @@
-# Board environment name (lilygo-t-display) must match the [env:] name in platformio.ini
-# Check with: grep "\[env:" platformio.ini
-
 name: Build and Release Firmware
 
 on:
   push:
     tags:
       - 'v*'
 
+permissions:
+  contents: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Cache PlatformIO
         uses: actions/cache@v4
@@ -29,26 +33,61 @@ jobs:
         run: pip install platformio esptool
 
       - name: Build firmware
-        run: pio run
+        run: pio run -e lilygo-t-display
 
-      - name: Merge binaries into single file
+      - name: Merge binaries
         run: |
-          esptool.py --chip esp32 merge_bin \
+          esptool --chip esp32 merge-bin \
             -o merged-firmware.bin \
-            --flash_mode qout \
-            --flash_freq 80m \
-            --flash_size 4MB \
+            --flash-mode dio \
+            --flash-freq 40m \
+            --flash-size 4MB \
             0x1000 .pio/build/lilygo-t-display/bootloader.bin \
             0x8000 .pio/build/lilygo-t-display/partitions.bin \
             0x10000 .pio/build/lilygo-t-display/firmware.bin
 
-      - name: Create GitHub Release and upload assets
+      - name: Copy binaries to website
+        run: |
+          mkdir -p website/public/firmware
+          cp .pio/build/lilygo-t-display/bootloader.bin website/public/firmware/bootloader.bin
+          cp .pio/build/lilygo-t-display/partitions.bin website/public/firmware/partitions.bin
+          cp .pio/build/lilygo-t-display/firmware.bin website/public/firmware/firmware.bin
+          cp merged-firmware.bin website/public/firmware/merged-firmware.bin
+
+      - name: Update manifest version
+        run: |
+          TAG=${GITHUB_REF#refs/tags/}
+          cat > website/public/firmware/manifest.json << EOF
+          {
+            "name": "SecureGen",
+            "version": "${TAG}",
+            "new_install_prompt_erase": true,
+            "builds": [
+              {
+                "chipFamily": "ESP32",
+                "parts": [
+                  { "path": "/SecureGen/firmware/bootloader.bin", "offset": 4096 },
+                  { "path": "/SecureGen/firmware/partitions.bin", "offset": 32768 },
+                  { "path": "/SecureGen/firmware/firmware.bin",   "offset": 65536 }
+                ]
+              }
+            ]
+          }
+          EOF
+
+      - name: Commit firmware to repo
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add website/public/firmware/
+          git commit -m "firmware: update binaries for ${GITHUB_REF#refs/tags/}"
+          git push origin master
+
+      - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
             merged-firmware.bin
             .pio/build/lilygo-t-display/bootloader.bin
             .pio/build/lilygo-t-display/partitions.bin
             .pio/build/lilygo-t-display/firmware.bin
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

website/docs/add-board.md

@@ -1,23 +1,14 @@
 {
   "name": "SecureGen",
-  "version": "latest",
+  "version": "v2.0.0",
   "new_install_prompt_erase": true,
   "builds": [
     {
       "chipFamily": "ESP32",
       "parts": [
-        {
-          "path": "https://github.com/makepkg/SecureGen/releases/latest/download/bootloader.bin",
-          "offset": 4096
-        },
-        {
-          "path": "https://github.com/makepkg/SecureGen/releases/latest/download/partitions.bin",
-          "offset": 32768
-        },
-        {
-          "path": "https://github.com/makepkg/SecureGen/releases/latest/download/firmware.bin",
-          "offset": 65536
-        }
+        { "path": "/SecureGen/firmware/bootloader.bin", "offset": 4096 },
+        { "path": "/SecureGen/firmware/partitions.bin", "offset": 32768 },
+        { "path": "/SecureGen/firmware/firmware.bin",   "offset": 65536 }
       ]
     }
   ]

website/public/firmware/bootloader.bin

@@ -502,41 +502,9 @@ import Layout from '../layouts/Layout.astro';
   }
 
   function updateManifest() {
-    if (!selectedBoard || releases.length === 0) return;
-    
-    const baseUrl = selectedVersion === 'latest'
-      ? `https://github.com/${REPO}/releases/latest/download/`
-      : `https://github.com/${REPO}/releases/download/${selectedVersion}/`;
-    
-    const prefix = selectedBoard.asset_prefix;
-    
-    const manifest = {
-      name: "SecureGen",
-      version: selectedVersion,
-      new_install_prompt_erase: true,
-      builds: [{
-        chipFamily: selectedBoard.chip,
-        parts: [
-          { 
-            path: baseUrl + prefix + "bootloader.bin", 
-            offset: selectedBoard.offsets.bootloader 
-          },
-          { 
-            path: baseUrl + prefix + "partitions.bin", 
-            offset: selectedBoard.offsets.partitions 
-          },
-          { 
-            path: baseUrl + prefix + "firmware.bin", 
-            offset: selectedBoard.offsets.firmware 
-          }
-        ]
-      }]
-    };
-    
-    const blob = new Blob([JSON.stringify(manifest)], { type: 'application/json' });
     const flashButton = document.getElementById('flash-button');
     if (flashButton) {
-      flashButton.setAttribute('manifest', URL.createObjectURL(blob));
+      flashButton.setAttribute('manifest', '/SecureGen/firmware/manifest.json');
     }
   }