diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95576a95..c5da1a17 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -290,7 +290,7 @@ jobs: sudo apt-get update sudo apt-get install -y --no-install-recommends \ clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev \ - libstdc++-12-dev libmpv-dev libepoxy-dev libcurl4-openssl-dev + libstdc++-12-dev libmpv-dev libepoxy-dev libcurl4-openssl-dev libevdev-dev - name: Prepare Flutter Linux configuration run: | @@ -497,10 +497,18 @@ jobs: throw "Flutter 3.44.0 resolved to $actualCommit, expected $expectedCommit" } "$root\bin" | Out-File -FilePath $env:GITHUB_PATH -Append -Encoding utf8 - $versionJson = & "$root\bin\flutter.bat" --version --machine + & "$root\bin\flutter.bat" --version + if ($LASTEXITCODE -ne 0) { + throw "Unable to bootstrap the Flutter SDK" + } + $versionOutput = & "$root\bin\flutter.bat" --version --machine if ($LASTEXITCODE -ne 0) { throw "Unable to resolve the Flutter SDK version" } + $versionJson = $versionOutput | Where-Object { $_ -match '^\s*\{' } | Select-Object -Last 1 + if (-not $versionJson) { + throw "Flutter did not report machine-readable version JSON" + } $version = $versionJson | ConvertFrom-Json if ($version.frameworkVersion -ne "3.44.0") { throw "Flutter reported version $($version.frameworkVersion), expected 3.44.0" diff --git a/.maestro/subflows/settings_deep_checks.yaml b/.maestro/subflows/settings_deep_checks.yaml index ab76cc93..18bcbd1a 100644 --- a/.maestro/subflows/settings_deep_checks.yaml +++ b/.maestro/subflows/settings_deep_checks.yaml @@ -41,7 +41,7 @@ appId: com.edde746.plezy timeout: 10000 - tapOn: "(?s)^Manage Libraries.*" - extendedWaitUntil: - visible: "(?s)^Manage Libraries.*" + visible: "Maestro Movies" timeout: 10000 - back - extendedWaitUntil: diff --git a/windows/runner/mpv/mpv_player_property_contract_test.cpp b/windows/runner/mpv/mpv_player_property_contract_test.cpp index 32dd5eb3..6340225b 100644 --- a/windows/runner/mpv/mpv_player_property_contract_test.cpp +++ b/windows/runner/mpv/mpv_player_property_contract_test.cpp @@ -289,7 +289,8 @@ void TestTimedOutSubclassDetachCanBeAdopted() { ::WaitForSingleObject(block_exited, 1000) == WAIT_OBJECT_0, "the owner thread must leave the deterministic blocking message"); ::SendMessageW(windows.inner, WM_NULL, 0, 0); - ::SendMessageW(windows.inner, WM_POINTERUPDATE, 0, MAKELPARAM(12, 13)); + ::SendMessageW( + windows.inner, WM_POINTERUPDATE, MAKEWPARAM(1, POINTER_FLAG_UPDATE | POINTER_FLAG_INRANGE), MAKELPARAM(12, 13)); Check( g_forwarded_pointer_messages.load(std::memory_order_relaxed) == 1, "the adopted generation must resume pointer forwarding");