From ec268420f704b5fc701c320023635b2e829abbbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Sun, 20 Oct 2024 16:58:35 +0200 Subject: [PATCH] Check examples screenshots on windows (#16010) # Objective - Checks screenshots on Windows - Progress towards #15918 ## Solution - Checks screenshots on Windows - Also disable the helmet gltf scene in windows ci as it doesn't work --- .github/workflows/validation-jobs.yml | 14 +++++++++++++- examples/testbed/3d.rs | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml index 00fc5de314..ba79f4c834 100644 --- a/.github/workflows/validation-jobs.yml +++ b/.github/workflows/validation-jobs.yml @@ -148,7 +148,8 @@ jobs: secrets: inherit run-examples-on-windows-dx12: - if: ${{ github.event_name == 'merge_group' }} + # also run when pushed to main to update reference screenshots + if: ${{ github.event_name != 'pull_request' }} runs-on: windows-latest timeout-minutes: 30 steps: @@ -191,6 +192,17 @@ jobs: name: example-run-windows path: example-run/ + compare-windows-screenshots: + name: Compare Windows screenshots + needs: [run-examples-on-windows-dx12] + uses: ./.github/workflows/send-screenshots-to-pixeleagle.yml + with: + commit: ${{ github.sha }} + branch: ${{ github.ref_name }} + artifact: screenshots-windows + os: windows + secrets: inherit + run-examples-on-wasm: if: ${{ github.event_name == 'merge_group' }} runs-on: ubuntu-22.04 diff --git a/examples/testbed/3d.rs b/examples/testbed/3d.rs index ff96f10807..9f44840a8f 100644 --- a/examples/testbed/3d.rs +++ b/examples/testbed/3d.rs @@ -12,13 +12,13 @@ fn main() { .init_state::() .enable_state_scoped_entities::() .add_systems(OnEnter(Scene::Light), light::setup) - .add_systems(OnEnter(Scene::Gltf), gltf::setup) .add_systems(OnEnter(Scene::Animation), animation::setup) .add_systems(Update, switch_scene); // Those scenes don't work in CI on Windows runners #[cfg(not(all(feature = "bevy_ci_testing", target_os = "windows")))] - app.add_systems(OnEnter(Scene::Bloom), bloom::setup); + app.add_systems(OnEnter(Scene::Bloom), bloom::setup) + .add_systems(OnEnter(Scene::Gltf), gltf::setup); app.run(); }