d6647b9183
The punktfunk-session Vulkan client (clients/linux-session, now clients/session) builds and runs on Windows; the WinUI shell spawns it for every stream. Verified live: 10-bit HEVC via Vulkan Video on both AMD (iGPU) and NVIDIA, 5120x1440 at 130 fps / 8 ms end-to-end on the RTX 4090. - pf-ffvk: Windows bindgen branch (FFMPEG_DIR + PF_FFVK_VULKAN_INCLUDE, no pkg-config); provisioning fetches Vulkan-Headers (pinned v1.4.309). - pf-client-core: builds on Windows — WASAPI audio (audio_wasapi.rs, cfg-swapped via #[path], same surface as the PipeWire twin), VAAPI/dmabuf gated inline (chain = vulkan -> software), trust reads the WinUI shell's %APPDATA% stores (parity tests pin both serialized shapes), Settings gains adapter/hdr_enabled (serde-defaulted; Linux stores unaffected). - pf-presenter: builds on Windows — dmabuf module Linux-gated; SDL keyboard grab while captured (Alt+Tab/Win reach the host); pick_device ranks discrete over integrated (device 0 was the iGPU on hybrid boxes — the silent footgun) and honors PUNKTFUNK_VK_ADAPTER (the Settings GPU pick, exported by the session). - run loop: block in one SDL wait woken by input AND decoded frames (a per- session forwarder pushes a FrameWake user event) instead of a 1 ms poll — measured 111%% -> 5%% of a core (NVIDIA), 86%% -> 3.5%% (AMD), stats unchanged. The pump's decode-fence wait became once-per-window sampling (no per-frame pipeline stall; the stat now shows true backlog). - pf-console-ui: builds on Windows (skia-safe msvc prebuilts); font lookup falls through fontconfig aliases to concrete DirectWrite families (Consolas/Segoe UI) — browse/coverflow works, verified against a live host. - WinUI shell: session-always via new src/spawn.rs (GTK spawn.rs port — CREATE_NO_WINDOW, stdout contract, kill handle); the Stream screen is a status card (chips + stage lines from the child's stats). The legacy in-process D3D11VA path stays behind Settings "Streaming engine" / PUNKTFUNK_BUILTIN_ STREAM=1 as the A/B baseline until Phase 8 deletes it. SessionParams.video_caps makes the HDR toggle real. - clients/linux-session renamed to clients/session (builds for both OSes). - CI/MSIX: both workflows build/test both bins with widened path filters; the MSIX ships punktfunk-session.exe. ARM64 session builds --no-default-features (rust-skia has no aarch64-pc-windows-msvc prebuilts; flip when it does). A/B on this box (5120x1440 HEVC vs home-worker-5): NVIDIA Vulkan 130 fps / 8 ms e2e / 1.6 ms decode — clearly better than the built-in path. The AMD iGPU VCN saturates at ~52 fps where its own D3D11VA does ~70 — Adrenalin Vulkan decode is slower on APU silicon; discrete RDNA validation gates Phase 8. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
174 lines
9.2 KiB
YAML
174 lines
9.2 KiB
YAML
# Build the punktfunk Windows client as signed MSIX packages (x64 + ARM64) and publish them to
|
|
# Gitea's generic package registry, so Windows boxes can download + install a real package (Start
|
|
# tile, clean install/uninstall) instead of a loose exe. Runs on a self-hosted windows-amd64
|
|
# runner (host mode; the MSVC/WinUI toolchain comes from unom/infra's windows-runner/, FFmpeg
|
|
# self-provisions via the "Ensure Windows toolchain" step below, same as windows.yml) — the
|
|
# Windows SDK's makeappx/signtool are baked into the runner's daemon env.
|
|
#
|
|
# Both arches come off the ONE x64 runner: x86_64 natively, aarch64 cross-compiled (the x64 MSVC
|
|
# toolset has the ARM64 cross compiler; the matrix points FFMPEG_DIR at the ARM64 FFmpeg tree). See
|
|
# windows.yml for the cross-build rationale + the BOM/MAX_PATH runner gotchas.
|
|
#
|
|
# Registry (public, unom org): https://git.unom.io/unom/-/packages (generic group)
|
|
# Packaging internals: clients/windows/packaging/README.md.
|
|
#
|
|
# Versioning — single project version; MSIX requires a strictly 4-part numeric version, so:
|
|
# vX.Y.Z tag -> X.Y.Z.0 (THE release; any -rc/+meta pre-release suffix is dropped for MSIX).
|
|
# Published to the generic registry + the stable `latest/` alias + attached to the
|
|
# unified Gitea Release alongside every other platform's artifact.
|
|
# main push / dispatch -> <next-minor>.<run_number>.0 (canary; base is one minor ahead of the
|
|
# latest stable tag via scripts/ci/pf-version.ps1, run number climbs monotonically).
|
|
# Published to the generic registry + the `canary/` alias.
|
|
# Both arches share the version; artifacts are arch-suffixed (..._x64.msix / ..._arm64.msix).
|
|
#
|
|
# Signing (packaging/pack-msix.ps1): if the MSIX_CERT_PFX_B64 / MSIX_CERT_PASSWORD Actions secrets
|
|
# are set (a real or shared code-signing .pfx whose subject DN == Publisher), the package is signed
|
|
# with them. Otherwise an ephemeral self-signed cert is generated and its public .cer is published
|
|
# next to the .msix (users import it to Trusted People before install). Drop in a real cert later
|
|
# with no workflow change — just add the secrets (+ pass -Publisher if its subject differs).
|
|
name: windows-msix
|
|
|
|
on:
|
|
push:
|
|
branches: [main]
|
|
paths:
|
|
- 'clients/windows/**'
|
|
- 'clients/session/**'
|
|
- 'crates/punktfunk-core/**'
|
|
- 'crates/pf-client-core/**'
|
|
- 'crates/pf-presenter/**'
|
|
- 'crates/pf-console-ui/**'
|
|
- 'crates/pf-ffvk/**'
|
|
- 'Cargo.lock'
|
|
- 'Cargo.toml'
|
|
- '.gitea/workflows/windows-msix.yml'
|
|
tags: ['v*']
|
|
workflow_dispatch:
|
|
|
|
env:
|
|
REGISTRY: git.unom.io
|
|
OWNER: unom
|
|
PKG: punktfunk-client-windows
|
|
|
|
jobs:
|
|
package:
|
|
runs-on: windows-amd64
|
|
timeout-minutes: 90
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
include:
|
|
- arch: x64
|
|
target: x86_64-pc-windows-msvc
|
|
ffmpeg: C:\Users\Public\ffmpeg
|
|
td: C:\t
|
|
session_flags: ''
|
|
- arch: arm64
|
|
target: aarch64-pc-windows-msvc
|
|
ffmpeg: C:\Users\Public\ffmpeg-arm64
|
|
td: C:\t-a64
|
|
# No skia-binaries prebuilt for aarch64-pc-windows-msvc: the session ships
|
|
# without the Skia console UI on ARM64 (streaming unaffected) — flip when
|
|
# rust-skia adds the target.
|
|
session_flags: '--no-default-features'
|
|
steps:
|
|
- uses: actions/checkout@v4
|
|
|
|
- name: Ensure Windows toolchain (WDK, FFmpeg, Inno Setup, ARM64 target)
|
|
shell: pwsh
|
|
run: ./scripts/ci/ensure-windows-toolchain.ps1
|
|
|
|
- name: Configure + version
|
|
shell: pwsh
|
|
run: |
|
|
# windows-reactor's build.rs unwraps CARGO_WORKSPACE_DIR; CARGO_TARGET_DIR (per-arch, short)
|
|
# dodges the MAX_PATH wall in the CMake-from-source crates (see windows.yml). FFMPEG_DIR
|
|
# selects the arch's import libs + is read by pack-msix.ps1 for the runtime DLLs. All via
|
|
# GITHUB_ENV.
|
|
"CARGO_WORKSPACE_DIR=$env:GITHUB_WORKSPACE" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
|
|
"CARGO_TARGET_DIR=${{ matrix.td }}" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
|
|
"FFMPEG_DIR=${{ matrix.ffmpeg }}" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
|
|
# pf-ffvk's bindgen needs Vulkan headers (arch-independent; provisioned alongside FFmpeg).
|
|
"PF_FFVK_VULKAN_INCLUDE=C:\Users\Public\vulkan-headers\include" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
|
|
rustup target add ${{ matrix.target }}
|
|
$pf = & "$env:GITHUB_WORKSPACE/scripts/ci/pf-version.ps1" # single source of truth: base is one minor ahead of the latest stable tag
|
|
$parts = if ($env:GITHUB_REF -like 'refs/tags/v*') {
|
|
# MSIX needs a purely-numeric 4-part version: drop any -rc/+meta pre-release suffix.
|
|
(($env:GITHUB_REF_NAME -replace '^v', '') -replace '[-+].*$', '').Split('.')
|
|
} else {
|
|
# Canary: <major>.<minor>.<run>.0 — major.minor track one minor ahead of stable, run climbs monotonically.
|
|
@($pf.PF_MAJOR, $pf.PF_MINOR, $env:GITHUB_RUN_NUMBER)
|
|
}
|
|
while ($parts.Count -lt 4) { $parts += '0' }
|
|
$v = ($parts[0..3] -join '.')
|
|
"MSIX_VERSION=$v" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
|
|
Write-Output "MSIX version $v arch ${{ matrix.arch }} target ${{ matrix.target }}"
|
|
|
|
# Both client binaries — the shell spawns punktfunk-session.exe (a package sibling)
|
|
# for every stream. --no-default-features on ARM64 is a no-op for the shell.
|
|
- name: Build (release)
|
|
shell: pwsh
|
|
run: cargo build --release -p punktfunk-client-windows -p punktfunk-client-session ${{ matrix.session_flags }} --target ${{ matrix.target }}
|
|
|
|
- name: Pack + sign MSIX
|
|
shell: pwsh
|
|
env:
|
|
MSIX_CERT_PFX_B64: ${{ secrets.MSIX_CERT_PFX_B64 }}
|
|
MSIX_CERT_PASSWORD: ${{ secrets.MSIX_CERT_PASSWORD }}
|
|
run: |
|
|
& clients/windows/packaging/pack-msix.ps1 `
|
|
-Version $env:MSIX_VERSION -Arch ${{ matrix.arch }} `
|
|
-TargetDir ${{ matrix.td }}\${{ matrix.target }}\release -OutDir ${{ matrix.td }}\msix
|
|
|
|
- name: Publish to Gitea generic registry
|
|
shell: pwsh
|
|
env:
|
|
REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
|
run: |
|
|
$PSNativeCommandUseErrorActionPreference = $false
|
|
$base = "https://$($env:REGISTRY)/api/packages/$($env:OWNER)/generic/$($env:PKG)"
|
|
# stable release -> `latest/` alias; canary main build -> `canary/` alias.
|
|
$alias = if ($env:GITHUB_REF -like 'refs/tags/v*') { 'latest' } else { 'canary' }
|
|
# version-less, arch-suffixed alias names so each channel keeps one predictable URL.
|
|
$aliasNames = @{
|
|
"$($env:MSIX_PATH)" = "$($env:PKG)_${{ matrix.arch }}.msix"
|
|
"$($env:MSIX_CER_PATH)" = "$($env:PKG)_${{ matrix.arch }}.cer"
|
|
}
|
|
$files = @($env:MSIX_PATH, $env:MSIX_CER_PATH) | Where-Object { $_ -and (Test-Path $_) }
|
|
if (-not $files) { throw "pack produced no artifacts to publish" }
|
|
function Put($f, $url) {
|
|
# The generic registry makes a versioned path immutable and 409s a re-upload, so a tag
|
|
# re-run re-publishing the identical artifact must be tolerated as a no-op. (The channel
|
|
# alias below is delete-then-reuploaded and never 409s.) No curl -f, so we can read the
|
|
# status code instead of aborting on it.
|
|
$code = [int](curl.exe -sS -o NUL -w "%{http_code}" --user "enricobuehler:$($env:REGISTRY_TOKEN)" --upload-file "$f" "$url")
|
|
if ($LASTEXITCODE -ne 0) { throw "upload failed (curl exit $LASTEXITCODE): $url" }
|
|
if ($code -eq 409) { Write-Output "already published (409, immutable): $url"; return }
|
|
if ($code -lt 200 -or $code -ge 300) { throw "upload failed (HTTP $code): $url" }
|
|
Write-Output "published ($code): $url"
|
|
}
|
|
foreach ($f in $files) {
|
|
$name = Split-Path $f -Leaf
|
|
# 1) immutable, versioned path
|
|
Put $f "$base/$($env:MSIX_VERSION)/$name"
|
|
# 2) channel alias (delete-then-reupload; the generic registry 409s on an existing file)
|
|
$an = $aliasNames["$f"]
|
|
curl.exe -fsS -o NUL --user "enricobuehler:$($env:REGISTRY_TOKEN)" -X DELETE "$base/$alias/$an" 2>$null
|
|
Put $f "$base/$alias/$an"
|
|
}
|
|
|
|
# On a real release, also attach the MSIX (+ its .cer) to the unified Gitea Release. Both
|
|
# arch legs attach to the same release concurrently — the helper's create-or-fetch handles
|
|
# the race, and x64/arm64 filenames differ so the assets don't collide.
|
|
- name: Attach MSIX to the Gitea release (stable tags only)
|
|
if: startsWith(gitea.ref, 'refs/tags/v')
|
|
shell: pwsh
|
|
env:
|
|
GITEA_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
|
|
run: |
|
|
. scripts/ci/gitea-release.ps1
|
|
$rid = Ensure-GiteaRelease -Tag $env:GITHUB_REF_NAME -Name $env:GITHUB_REF_NAME -Prerelease 'auto'
|
|
foreach ($f in @($env:MSIX_PATH, $env:MSIX_CER_PATH)) {
|
|
if ($f -and (Test-Path $f)) { Upsert-GiteaAsset -ReleaseId $rid -File $f }
|
|
}
|