Skip to content

Commit a008fe3

Browse files
authored
Fix test execution seeping into lint-only job that didn't have software rasterizer setup (#10025)
1 parent 8d6357a commit a008fe3

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

.github/workflows/reusable_checks_rust.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ jobs:
8080
if: ${{ inputs.CHANNEL == 'pr' }}
8181
run: pixi run rs-check --only base_checks sdk_variations cargo_deny wasm docs
8282

83-
- name: Rust most checks & tests
83+
- name: Rust most checks (`main` branch subset)
8484
if: ${{ inputs.CHANNEL == 'main' }}
85-
run: pixi run rs-check --skip individual_crates docs_slow
85+
run: pixi run rs-check --skip individual_crates docs_slow tests tests_without_all_features # Tests run in a separate job
8686

87-
- name: Rust all checks & tests
87+
- name: Rust all checks (nightly)
8888
if: ${{ inputs.CHANNEL == 'nightly' }}
89-
run: pixi run rs-check
89+
run: pixi run rs-check --skip tests tests_without_all_features # Tests run in a separate job
9090

9191
- name: .rrd backwards compatibility
9292
# We don't yet guarantee backwards compatibility, but we at least check it
@@ -95,7 +95,7 @@ jobs:
9595
run: pixi run check-backwards-compatibility
9696

9797
rs-tests:
98-
name: Rust lints (tests)
98+
name: Rust tests
9999
# TODO(andreas): setup-vulkan doesn't work on 24.4 right now due to missing .so
100100
runs-on: ubuntu-22.04-large
101101
env:
@@ -132,10 +132,13 @@ jobs:
132132
- name: Setup software rasterizer
133133
run: pixi run python ./scripts/ci/setup_software_rasterizer.py
134134

135-
- name: Rust checks (PR subset)
136-
if: ${{ inputs.CHANNEL == 'pr' }}
135+
- name: Rust tests
137136
run: pixi run rs-check --only tests
138137

138+
- name: Rust tests without --all-features
139+
if: ${{ inputs.CHANNEL != 'pr' }}
140+
run: pixi run rs-check --only tests_without_all_features
141+
139142
- name: Upload test results
140143
uses: actions/upload-artifact@v4
141144
if: always()

crates/viewer/re_renderer/src/device_caps.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,7 @@ pub fn testing_instance_descriptor() -> wgpu::InstanceDescriptor {
386386
let backends = wgpu::Backends::VULKAN | wgpu::Backends::METAL;
387387

388388
let flags = (
389-
wgpu::InstanceFlags::ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER
390-
// Validation would be great, but it looks like we don't always get validation layers, causing this error:
391-
// `InstanceFlags::VALIDATION requested, but unable to find layer: VK_LAYER_KHRONOS_validation`
392-
//| wgpu::InstanceFlags::VALIDATION
393-
389+
wgpu::InstanceFlags::ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER | wgpu::InstanceFlags::VALIDATION
394390
// TODO(andreas): GPU based validation layer sounds like a great idea,
395391
// but as of writing this makes tests crash on my Windows machine!
396392
// It looks like the crash is in the Vulkan/Nvidia driver, but further investigation is needed.

0 commit comments

Comments
 (0)