Merge branch 'main' into enh-clone

Author: GameTec-live

.github/workflows/build_client.yml

@@ -35,13 +35,18 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.checkout-sha == null && github.sha || inputs.checkout-sha }}
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - name: Install PyInstaller and client dependencies
         run: |
-          pip3 install pyinstaller
-          pip3 install -r software/script/requirements.txt
+          python -m pip install --upgrade pip
+          pip install pyinstaller
+          pip install -r software/script/requirements.txt
       - name: Run OS specific setup
         run: ${{ matrix.pre_command }}
       - name: Compile native code
@@ -56,14 +61,14 @@ jobs:
           cd software
           pyinstaller pyinstaller.spec
       - name: Upload built client
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: client-${{ matrix.name }}
           path: software/dist/*
       - name: Zip up client for release
         run: ${{ matrix.bundle_command }}
       - name: Upload release artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-${{ matrix.name }}
           path: client-${{ matrix.name }}.zip

.github/workflows/build_firmware.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.checkout-sha == null && github.sha || inputs.checkout-sha }}
           fetch-depth: 0
@@ -54,7 +54,7 @@ jobs:
         device_type: [ultra, lite]
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.checkout-sha == null && github.sha || inputs.checkout-sha }}
           fetch-depth: 0
@@ -64,7 +64,7 @@ jobs:
         run: |
           docker run --rm -v ${PWD}:/workdir -e CURRENT_DEVICE_TYPE=${{ matrix.device_type }} ghcr.io/${repo,,}-fw-builder@${{ needs.build_fw_builder.outputs.image_hash }} firmware/build.sh
       - name: Upload built binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device_type }}-firmware
           path: firmware/objects/*.hex
@@ -76,17 +76,17 @@ jobs:
           unzip firmware/objects/${{ matrix.device_type }}-dfu-app.zip -d firmware/objects/${{ matrix.device_type }}-dfu-app
           unzip firmware/objects/${{ matrix.device_type }}-dfu-full.zip -d firmware/objects/${{ matrix.device_type }}-dfu-full
       - name: Upload dfu app image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device_type }}-dfu-app
           path: firmware/objects/${{ matrix.device_type }}-dfu-app/*
       - name: Upload dfu full image
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device_type }}-dfu-full
           path: firmware/objects/${{ matrix.device_type }}-dfu-full/*
       - name: Upload release artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: release-artifacts
+          name: release-artifacts-${{ matrix.device_type }}
           path: firmware/objects/*.zip

.github/workflows/deploy_wiki_to_pages.yml

@@ -0,0 +1,49 @@
+name: Deploy wiki to GitHub Pages with Jekyll
+
+on:
+  push:
+    branches: ["main"]
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Build job
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          repository: ${{ github.repository }}.wiki
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/on_pr.yml

@@ -10,12 +10,12 @@ jobs:
       contents: read
     uses: ./.github/workflows/build_firmware.yml
     with:
-      checkout-sha: "${{ github.event.pull_request.merge_commit_sha }}"
+      checkout-sha: "${{ github.event.pull_request.head.sha }}"
   client_pipeline:
     name: Build Firmware
     uses: ./.github/workflows/build_client.yml
     with:
-      checkout-sha: "${{ github.event.pull_request.merge_commit_sha }}"
+      checkout-sha: "${{ github.event.pull_request.head.sha }}"
   comment:
     runs-on: ubuntu-latest
     name: Comment on PR

.github/workflows/on_push.yml

@@ -24,11 +24,12 @@ jobs:
       - client_pipeline
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download release artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          pattern: release-artifacts-*
+          merge-multiple: true
           path: release-artifacts
       - name: Upload to dev release
         uses: softprops/action-gh-release@v1
@@ -60,11 +61,12 @@ jobs:
       - client_pipeline
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download release artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: release-artifacts
+          pattern: release-artifacts-*
+          merge-multiple: true
           path: release-artifacts
       - name: Upload to tagged release
         uses: softprops/action-gh-release@v1

.github/workflows/python-checks.yml

@@ -0,0 +1,56 @@
+name: Lint (pyrefly + ruff)
+
+on:
+  pull_request:
+    paths:
+      - "software/**"
+      - ".github/workflows/**"
+  workflow_dispatch:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+        working-directory: software
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+          cache: "pip"
+          cache-dependency-path: |
+            software/pyproject.toml
+            software/uv.lock
+            software/script/requirements.txt
+
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v6
+
+      - name: Install dependencies with uv (if lockfile present)
+        if: ${{ hashFiles('software/uv.lock') != '' }}
+        run: uv sync --dev
+
+      - name: Install tools with pip (fallback)
+        if: ${{ hashFiles('software/uv.lock') == '' }}
+        run: |
+          python -m pip install --upgrade pip
+          # Try project requirements if present
+          if [ -f script/requirements.txt ]; then pip install -r script/requirements.txt || true; fi
+          # Ensure ruff and pyrefly are available
+          pip install ruff pyrefly
+
+      - name: Ruff check
+        run: |
+          set -e
+          (uv run ruff --version && uv run ruff check .) || ruff check .
+
+      - name: Pyrefly check
+        run: |
+          set -e
+          (uv run pyrefly --help >/dev/null 2>&1 && uv run pyrefly check) || pyrefly check