From 09bfec368683512c05b53ffede3ee1fd55b13e03 Mon Sep 17 00:00:00 2001 From: firestar99 Date: Mon, 3 Nov 2025 15:53:45 +0100 Subject: [PATCH 1/3] ci: add compiletest target spv1.4 since some tests require spv1.4+ or vulkan1.2 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5e178d6aee..a82c46ab15 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -152,7 +152,7 @@ jobs: - name: cargo fetch --locked run: cargo fetch --locked --target $TARGET - name: compiletest - run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4,spv1.3 + run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4,spv1.3,spv1.4 difftest: name: Difftest From 576ff56587243eb97bf665e2ae862d0de0eafcb4 Mon Sep 17 00:00:00 2001 From: Firestar99 Date: Tue, 15 Jul 2025 21:53:30 +0200 Subject: [PATCH 2/3] ci: do not fail-fast matrices --- .github/workflows/ci.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a82c46ab15..44992bcd24 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,6 +16,7 @@ jobs: test: name: Test strategy: + fail-fast: false matrix: os: [ ubuntu-24.04, windows-2022, macOS-latest ] runs-on: ${{ matrix.os }} @@ -131,6 +132,7 @@ jobs: compiletest: name: Compiletest strategy: + fail-fast: false matrix: os: [ ubuntu-24.04, windows-2022, macOS-latest ] runs-on: ${{ matrix.os }} @@ -157,6 +159,7 @@ jobs: difftest: name: Difftest strategy: + fail-fast: false matrix: os: [ ubuntu-24.04, windows-2022, macOS-latest ] runs-on: ${{ matrix.os }} From 39d4c69c74684a66a3cbef5dc36ed3e8ccf0eede Mon Sep 17 00:00:00 2001 From: firestar99 Date: Mon, 3 Nov 2025 16:32:51 +0100 Subject: [PATCH 3/3] fix compiletest for spv1.4 and up --- tests/compiletests/ui/dis/asm_op_decorate.rs | 3 +++ tests/compiletests/ui/dis/non-writable-storage_buffer.rs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/tests/compiletests/ui/dis/asm_op_decorate.rs b/tests/compiletests/ui/dis/asm_op_decorate.rs index 604e1a241c..d279beaee5 100644 --- a/tests/compiletests/ui/dis/asm_op_decorate.rs +++ b/tests/compiletests/ui/dis/asm_op_decorate.rs @@ -17,6 +17,9 @@ // ignore-vulkan1.2 // ignore-vulkan1.3 // ignore-vulkan1.4 +// ignore-spv1.4 +// ignore-spv1.5 +// ignore-spv1.6 use core::arch::asm; use spirv_std::spirv; diff --git a/tests/compiletests/ui/dis/non-writable-storage_buffer.rs b/tests/compiletests/ui/dis/non-writable-storage_buffer.rs index 836eed62b9..32e2d05a9b 100644 --- a/tests/compiletests/ui/dis/non-writable-storage_buffer.rs +++ b/tests/compiletests/ui/dis/non-writable-storage_buffer.rs @@ -18,6 +18,9 @@ // ignore-vulkan1.2 // ignore-vulkan1.3 // ignore-vulkan1.4 +// ignore-spv1.4 +// ignore-spv1.5 +// ignore-spv1.6 use spirv_std::spirv;