chore: 2.12.3 backports

.github/actions/build_companion/action.yml

@@ -0,0 +1,120 @@
+name: 'Build Companion'
+inputs:
+  os:
+    description: 'OS / Architecture'
+    required: true
+  qt-version:
+    description: 'Qt version'
+    default: '6.9.3'
+  qt-arch:
+    description: 'Qt architecture'
+    required: runner.os != 'Linux'
+  sdl2-version:
+    description: 'Upstream SDL2 version (Windows only)'
+    default: '2.32.8'
+  sdl3-version:
+    description: 'SDL3 version built from source for macOS'
+    default: '3.4.14'
+  sdl2-compat-version:
+    description: 'sdl2-compat version built from source for macOS'
+    default: '2.32.70'
+  macos-deployment-target:
+    description: 'Minimum macOS version the SDL libraries are built for'
+    default: '11.0'
+  setup-python:
+    description: >-
+      Let install-qt-action provision Python. Set false when the workflow has already
+      installed its own interpreter plus the build's Python packages, otherwise the
+      one install-qt-action selects shadows it and the codegen imports fail.
+    default: 'true'
+
+runs:
+  using: "composite"
+  steps:
+
+    - name: Install Qt
+      if: runner.os != 'Linux'
+      uses: jdpurcell/install-qt-action@v5
+      env:
+        AQT_CONFIG: ${{ github.workspace }}/tools/aqt-settings.ini
+      with:
+        version: ${{ inputs.qt-version }}
+        modules: 'qtmultimedia qtserialport'
+        arch: ${{ inputs.qt-arch }}
+        setup-python: ${{ inputs.setup-python }}
+        cache: true
+        cache-key-prefix: 'install-qt-action-${{ inputs.qt-arch }}'
+
+    # macOS builds SDL from source (see setup-sdl.sh) - cache it so only the first
+    # run per version pays for it
+    - name: Cache SDL build
+      if: runner.os == 'macOS'
+      uses: actions/cache@v6
+      with:
+        path: ${{ runner.temp }}/sdl
+        key: sdl-${{ runner.os }}-${{ inputs.sdl3-version }}-${{ inputs.sdl2-compat-version }}-${{ inputs.macos-deployment-target }}
+
+    - name: Setup SDL
+      if: runner.os != 'Linux'
+      shell: bash
+      env:
+        ACTION_PATH: ${{ github.action_path }}
+        SDL2_VERSION: ${{ inputs.sdl2-version }}
+        SDL3_VERSION: ${{ inputs.sdl3-version }}
+        SDL2_COMPAT_VERSION: ${{ inputs.sdl2-compat-version }}
+        MACOS_DEPLOYMENT_TARGET: ${{ inputs.macos-deployment-target }}
+      run: |
+        "${ACTION_PATH}/setup-sdl.sh"
+
+    - name: Setup MSVC
+      if: runner.os == 'Windows'
+      shell: pwsh
+      run: ${{ github.action_path }}/setup-msvc.ps1
+
+    - name: Install NSIS
+      if: runner.os == 'Windows'
+      uses: repolevedavaj/install-nsis@v1
+      with:
+        nsis-version: '3.11'
+
+    - name: Build
+      shell: bash
+      env:
+        CMAKE_BUILD_TYPE: 'Release'
+      run: |
+        mkdir output && \
+        CMAKE_PREFIX_PATH="$QT_ROOT_DIR;$SDL2_ROOT" \
+        tools/build-companion.sh "$(pwd)" "$(pwd)/output/"
+
+    - name: Compose release filename
+      if: always()
+      run: echo "artifact_name=edgetx-cpn-${{ inputs.os }}-${GITHUB_REF##*/}" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Collect build logs
+      if: always()
+      shell: bash
+      run: |
+        mkdir -p logs
+
+        if [ -d "build" ]; then
+          find build -name "*.log" -type f -exec cp {} logs/ \; 2>/dev/null || true
+          find build -name "CMakeOutput.log" -type f -exec cp {} logs/ \; 2>/dev/null || true
+          find build -name "CMakeError.log" -type f -exec cp {} logs/ \; 2>/dev/null || true
+        fi
+
+    - name: Archive production artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        name: "${{ env.artifact_name }}"
+        path:  ${{github.workspace}}/output
+        retention-days: 15
+
+    - name: Archive build logs
+      if: always()
+      uses: actions/upload-artifact@v7
+      with:
+        name: "${{ env.artifact_name }}-logs"
+        path: ${{github.workspace}}/logs
+        retention-days: 30
+        if-no-files-found: ignore

.github/actions/build_companion/setup-msvc.ps1

@@ -0,0 +1,39 @@
+# setup-msvc.ps1
+# Runs vcvarsall.bat and exports only the new/changed environment
+# variables to GitHub Actions, avoiding clobbering existing ones.
+
+param(
+    [string]$Arch = "x64"
+)
+
+# Find VS installation
+$vsWhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
+$vsPath  = & $vsWhere -latest -property installationPath
+$vcvars  = Join-Path $vsPath "VC\Auxiliary\Build\vcvarsall.bat"
+
+if (-not (Test-Path $vcvars)) {
+    Write-Error "vcvarsall.bat not found at: $vcvars"
+    exit 1
+}
+
+# Snapshot environment before
+$before = @{}
+Get-ChildItem env: | ForEach-Object { $before[$_.Name] = $_.Value }
+
+# Run vcvarsall.bat and import its environment into this process
+cmd /c "`"$vcvars`" $Arch && set" | ForEach-Object {
+    if ($_ -match '^([^=]+)=(.*)$') {
+        [System.Environment]::SetEnvironmentVariable($Matches[1], $Matches[2])
+    }
+}
+
+# Export only changed/new variables to GitHub Actions
+$count = 0
+Get-ChildItem env: | ForEach-Object {
+    if ($before[$_.Name] -ne $_.Value) {
+        "$($_.Name)=$($_.Value)" | Out-File -Append -Encoding utf8 $env:GITHUB_ENV
+        $count++
+    }
+}
+
+Write-Host "Exported $count environment variables to GITHUB_ENV"

.github/actions/build_companion/setup-sdl.sh

@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+# setup-sdl.sh
+# Provisions SDL for Companion builds.
+#
+#   Windows: upstream SDL2 MSVC development binaries.
+#   macOS:   sdl2-compat + SDL3 built from source.
+#   Linux:   provided by the Docker container.
+#
+# macOS builds against sdl2-compat rather than classic SDL2 because that is what users get
+# from Homebrew, and it is the configuration that exposed the SDL3 bundling bug - CI needs to
+# exercise the same code path Companion ships through.
+#
+# Homebrew itself cannot be used here: its bottles are single-architecture and target the
+# runner's macOS version, while Companion ships a universal binary for macOS 11.0+. Building
+# from source is what keeps both properties.
+
+set -euo pipefail
+
+SDL2_VERSION="${SDL2_VERSION:?SDL2_VERSION must be set}"
+
+build_cmake_project() {
+    local name="$1" url="$2" srcdir="$3"
+    shift 3
+
+    echo "Building ${name} (universal, macOS ${MACOS_DEPLOYMENT_TARGET}+)..."
+    curl -fsSL -o "${RUNNER_TEMP}/${name}.tar.gz" "${url}"
+    mkdir -p "${RUNNER_TEMP}/src"
+    tar -xzf "${RUNNER_TEMP}/${name}.tar.gz" -C "${RUNNER_TEMP}/src"
+
+    cmake -S "${RUNNER_TEMP}/src/${srcdir}" -B "${RUNNER_TEMP}/build-${name}" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+        -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET}" \
+        -DCMAKE_INSTALL_PREFIX="${SDL_ROOT}" \
+        -DCMAKE_PREFIX_PATH="${SDL_ROOT}" \
+        "$@"
+    cmake --build "${RUNNER_TEMP}/build-${name}" --parallel
+    cmake --install "${RUNNER_TEMP}/build-${name}"
+}
+
+case "$RUNNER_OS" in
+    Windows)
+        ARCHIVE="SDL2-devel-${SDL2_VERSION}-VC.zip"
+        URL="https://github.com/libsdl-org/SDL/releases/download/release-${SDL2_VERSION}/${ARCHIVE}"
+        DEST="${RUNNER_TEMP}/SDL2"
+
+        echo "Downloading SDL2 ${SDL2_VERSION} (Windows/MSVC)..."
+        curl -fsSL -o "${RUNNER_TEMP}/${ARCHIVE}" "${URL}"
+        unzip -q "${RUNNER_TEMP}/${ARCHIVE}" -d "${DEST}"
+
+        SDL2_ROOT="${DEST}/SDL2-${SDL2_VERSION}"
+        echo "SDL2_ROOT=${SDL2_ROOT}" >> "${GITHUB_ENV}"
+        ;;
+
+    macOS)
+        SDL3_VERSION="${SDL3_VERSION:?SDL3_VERSION must be set}"
+        SDL2_COMPAT_VERSION="${SDL2_COMPAT_VERSION:?SDL2_COMPAT_VERSION must be set}"
+        MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-11.0}"
+        SDL_ROOT="${RUNNER_TEMP}/sdl"
+        STAMP="${SDL_ROOT}/.stamp-${SDL3_VERSION}-${SDL2_COMPAT_VERSION}-${MACOS_DEPLOYMENT_TARGET}"
+
+        if [[ -f "${STAMP}" ]]; then
+            echo "Reusing cached SDL build in ${SDL_ROOT}"
+        else
+            rm -rf "${SDL_ROOT}"
+
+            # SDL3 first - sdl2-compat needs its headers and CMake package to configure
+            build_cmake_project "SDL3" \
+                "https://github.com/libsdl-org/SDL/releases/download/release-${SDL3_VERSION}/SDL3-${SDL3_VERSION}.tar.gz" \
+                "SDL3-${SDL3_VERSION}" \
+                -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_TESTS=OFF -DSDL_EXAMPLES=OFF
+
+            build_cmake_project "sdl2-compat" \
+                "https://github.com/libsdl-org/sdl2-compat/releases/download/release-${SDL2_COMPAT_VERSION}/sdl2-compat-${SDL2_COMPAT_VERSION}.tar.gz" \
+                "sdl2-compat-${SDL2_COMPAT_VERSION}" \
+                -DSDL2COMPAT_STATIC=OFF -DSDL2COMPAT_TESTS=OFF
+
+            touch "${STAMP}"
+        fi
+
+        # Both live under one prefix, so a single entry on CMAKE_PREFIX_PATH finds
+        # SDL2 (sdl2-compat) and SDL3 alike.
+        echo "SDL2_ROOT=${SDL_ROOT}" >> "${GITHUB_ENV}"
+
+        echo "Verifying universal slices and deployment target..."
+        for lib in "${SDL_ROOT}"/lib/libSDL2-2.0.0.dylib "${SDL_ROOT}"/lib/libSDL3.0.dylib; do
+            [[ -f "${lib}" ]] || { echo "::error::Expected ${lib} to exist"; exit 1; }
+            archs="$(lipo -archs "${lib}")"
+            case "${archs}" in
+                *x86_64*arm64*|*arm64*x86_64*) ;;
+                *) echo "::error::${lib} is not universal (got: ${archs})"; exit 1 ;;
+            esac
+            echo "  $(basename "${lib}"): ${archs}"
+            vtool -show-build "${lib}" | grep -E 'minos|platform' || true
+        done
+        ;;
+
+    Linux)
+        echo "Skipping — SDL is provided by the Docker container"
+        ;;
+
+    *)
+        echo "::error::Unsupported RUNNER_OS: ${RUNNER_OS}"
+        exit 1
+        ;;
+esac
+
+echo "SDL setup complete for ${RUNNER_OS}"

.github/workflows/auto_close.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v11
         with:
           # Issue closure message
           close-issue-message: 'This issue has been closed due to no activity in over four weeks after having been marked as closure pending.'

.github/workflows/build_fw.yml

@@ -59,12 +59,12 @@ jobs:
           - pa01
           - t22
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:2.12
       volumes:
         - ${{ github.workspace }}:/src
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           submodules: recursive
           # fetch-depth: 0 # https://github.com/actions/checkout#Fetch-all-history-for-all-tags-and-branches
@@ -114,12 +114,12 @@ jobs:
           - t22
           - c14
     container:
-      image: ghcr.io/edgetx/edgetx-dev:latest
+      image: ghcr.io/edgetx/edgetx-dev:2.12
       volumes:
         - ${{ github.workspace }}:/src
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           submodules: recursive
 
@@ -153,7 +153,7 @@ jobs:
         run: echo "artifact_name=edgetx-firmware-${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       - name: Merge firmware artifact packages
-        uses: actions/upload-artifact/merge@v4
+        uses: actions/upload-artifact/merge@v7
         with:
           name: "${{ env.artifact_name }}"
           pattern: firmware-*

.github/workflows/companion.yml

@@ -12,6 +12,7 @@ on:
       - '.github/workflows/linux_cpn.yml'
       - '.github/workflows/macosx_cpn.yml'
       - '.github/workflows/win_cpn-64.yml'
+      - '.github/actions/build_companion/**'
       - 'companion/**'
       - 'tools/build-companion.sh'