diff --git a/.github/workflows/validation-jobs.yml b/.github/workflows/validation-jobs.yml index 6f4291b0aa..945d37ac13 100644 --- a/.github/workflows/validation-jobs.yml +++ b/.github/workflows/validation-jobs.yml @@ -161,7 +161,7 @@ jobs: example_name=`basename $example .ron` echo -n $example_name > last_example_run echo "running $example_name - "`date` - time WGPU_BACKEND=dx12 TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "bevy_ci_testing,trace,trace_chrome" + time WGPU_BACKEND=dx12 TRACE_CHROME=trace-$example_name.json CI_TESTING_CONFIG=$example cargo run --example $example_name --features "statically-linked-dxc,bevy_ci_testing,trace,trace_chrome" sleep 10 if [ `find ./ -maxdepth 1 -name 'screenshot-*.png' -print -quit` ]; then mkdir screenshots-$example_name @@ -186,6 +186,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-latest diff --git a/examples/testbed/3d.rs b/examples/testbed/3d.rs index a15f7a21dd..edb53a0c57 100644 --- a/examples/testbed/3d.rs +++ b/examples/testbed/3d.rs @@ -12,14 +12,11 @@ fn main() { app.add_plugins((DefaultPlugins,)) .init_state::() .add_systems(OnEnter(Scene::Light), light::setup) + .add_systems(OnEnter(Scene::Bloom), bloom::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) - .add_systems(OnEnter(Scene::Gltf), gltf::setup); - #[cfg(feature = "bevy_ci_testing")] app.add_systems(Update, helpers::switch_scene_in_ci::); @@ -139,7 +136,6 @@ mod light { } } -#[cfg(not(all(feature = "bevy_ci_testing", target_os = "windows")))] mod bloom { use bevy::{ core_pipeline::{bloom::Bloom, tonemapping::Tonemapping}, @@ -193,7 +189,6 @@ mod bloom { } } -#[cfg(not(all(feature = "bevy_ci_testing", target_os = "windows")))] mod gltf { use bevy::prelude::*;