wasm: format

Author: georgik

.github/workflows/release.yml

@@ -1,89 +1,55 @@
-name: Release ESP32 Rust Binaries
+name: Release
 
 on:
+  push:
+    tags:
+      - 'v*.*.*'
   workflow_dispatch:
-    inputs:
-      release_tag:
-        description: "Upload to specific release"
-        required: true
-        default: 'v0.1.0'
-      skip_projects:
-        description: "Skip projects during build (e.g. esp32-c3-devkit-rust)"
-        required: false
-        default: ''
 
 jobs:
-  get_release:
-    name: Get release
+  release:
     runs-on: ubuntu-latest
-    outputs:
-      upload_url: ${{ steps.get_upload_url.outputs.url }}
     steps:
-      - uses: octokit/request-action@v2.x
-        id: get_release
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Rust
+        uses: actions-rs/toolchain@v1
         with:
-          route: GET /repos/{owner}/{repo}/releases/tags/${{ github.event.inputs.release_tag }}
-          owner: georgik
-          repo: esp32-conways-game-of-life-rs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: get upload url
-        id: get_upload_url
+          toolchain: stable
+          override: true
+
+      - name: Build ESP32 Projects
         run: |
-          url=$(echo "$response" | jq -r '.upload_url' | sed 's/{?name,label}//')
-          echo "::set-output name=url::$url"
-        env:
-          response: ${{ steps.get_release.outputs.data }}
+          for dir in esp32-c3-lcdkit esp32-c6-waveshare-1_47 esp32-s3-box-3 esp32-s3-box-3-minimal; do
+            cd $dir && cargo build --release && cd ..
+          done
 
-  build:
-    runs-on: ubuntu-20.04
-    container:
-      image: espressif/idf-rust:all_1.73.0.1
-      options: --user esp --workdir /home/esp
-    needs: get_release
-    steps:
-      - name: Clone repository with specific branch
+      - name: Build WASM Package
         run: |
-          export HOME=/home/esp
-          cd /home/esp
-          curl -L https://wokwi.com/ci/install.sh | sh
-          pwd
-          git clone --depth 1 --branch ${{ github.ref_name }} https://github.com/georgik/esp32-conways-game-of-life-rs.git project
-      - name: Build and upload binaries
+          cd wasm
+          wasm-pack build --target web --release
+
+      - name: Create GitHub Release
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: ${{ github.ref }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WOKWI_CLI_TOKEN: ${{ secrets.WOKWI_CLI_TOKEN }}
-        run: |
-          # Workaround GitHub issue with setting HOME in container https://github.com/actions/runner/issues/863
-          export HOME=/home/esp
-          cd /home/esp
-          . /home/esp/.bashrc
-          . /home/esp/export-esp.sh
-          # Upload loop for each binary
-          cd project
 
-          VERSION=$(grep '^version =' Cargo.toml | cut -d '"' -f2)
-          CHIP=$(grep 'hal = { package =' Cargo.toml | cut -d '"' -f2 | cut -d '-' -f1)
-
-          cargo espflash save-image --chip ${CHIP} --release --merge --skip-padding esp32-conways-game-of-life-rs.bin
-
-          /home/esp/bin/wokwi-cli --timeout 5000 --timeout-exit-code 0 --screenshot-part "lcd1" --screenshot-time 5000 --screenshot-file "screenshot.png" "."
-
-          asset_path="/home/esp/project/esp32-conways-game-of-life-rs.bin"
-          asset_name="esp32-conways-game-of-life-rs-${{ github.event.inputs.release_tag }}.bin"
-          curl \
-              --request POST \
-              --header "authorization: Bearer $GITHUB_TOKEN" \
-              --header "Content-Type: application/octet-stream" \
-              --data-binary "@$asset_path" \
-              --url "${{ needs.get_release.outputs.upload_url }}?name=${asset_name}"
-
-          asset_path="/home/esp/project/screenshot.png"
-          asset_name="esp32-conways-game-of-life-rs-${{ github.event.inputs.release_tag }}.png"
-          curl \
-            --request POST \
-            --header "authorization: Bearer $GITHUB_TOKEN" \
-            --header "Content-Type: application/octet-stream" \
-            --data-binary "@$asset_path" \
-            --url "${{ needs.get_release.outputs.upload_url }}?name=${asset_name}"
+      - name: Upload WASM Assets to Release
+        uses: softprops/action-gh-release@v1
+        with:
+          files: |
+            wasm/pkg/*.wasm
+            wasm/pkg/*.js
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Deploy WASM to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages
+          folder: wasm/pkg
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/rust_ci.yml

@@ -12,29 +12,62 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  rust-checks:
-    name: Rust Checks
+  esp32-checks:
+    name: ESP32 Checks
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        project: [ "esp32-c3-lcdkit", "esp32-c6-waveshare-1_47", "esp32-s3-box-3", "esp32-s3-box-3-minimal" ]
         action:
-          - command: build
-            args: --release
-          - command: fmt
-            args: --all -- --check --color always
-          - command: clippy
-            args: --all-features --workspace -- -D warnings
+          - { command: build, args: "--release" }
+          - { command: fmt, args: "--all -- --check --color always" }
+          - { command: clippy, args: "--all-features --workspace -- -D warnings" }
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+
       - name: Enable caching
         uses: Swatinem/rust-cache@v2
-      - name: Setup Rust
+
+      - name: Setup Rust for ESP32
         uses: esp-rs/xtensa-toolchain@v1.5
         with:
           default: true
           buildtargets: esp32s3
           ldproxy: false
+
+      - name: Change directory to project
+        run: cd ${{ matrix.project }}
+
+      - name: Run command
+        run: cargo ${{ matrix.action.command }} ${{ matrix.action.args }}
+
+  wasm-checks:
+    name: WASM Checks
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        action:
+          - { command: build, args: "--target wasm32-unknown-unknown --release" }
+          - { command: fmt, args: "--all -- --check --color always" }
+          - { command: clippy, args: "--all-features --workspace -- -D warnings" }
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Enable caching
+        uses: Swatinem/rust-cache@v2
+
+      - name: Setup Rust for WASM
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          target: wasm32-unknown-unknown
+
+      - name: Change directory to wasm
+        run: cd wasm
+
       - name: Run command
         run: cargo ${{ matrix.action.command }} ${{ matrix.action.args }}