Skip to content

fix(ci): resolve broken job name in shader validation workflow #2485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doodlum merged 3 commits into from
Jun 7, 2026
+5 −11
Merged

fix(ci): resolve broken job name in shader validation workflow #2485

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edc9a96
fix(ci): resolve broken job name in shader validation workflow
doodlum Jun 7, 2026
4c3165c
fix(ci): simplify job name to "Validate shader compilation"
doodlum Jun 7, 2026
9cc9b4f
fix(ci): remove remaining Flatrim references from cache key and artif…
doodlum Jun 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions .github/workflows/_shared-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,10 @@ jobs:

shader-validation:
if: inputs.run-shader-validation
name: Validate shader compilation (${{ matrix.config.name }})
name: Validate shader compilation
runs-on: windows-2025
permissions:
contents: read
strategy:
matrix:
config:
- name: "Flatrim"
file: ".github/configs/shader-validation.yaml"
fail-fast: false
steps:
- name: Checkout code
uses: actions/checkout@v6
Expand All @@ -152,7 +146,7 @@ jobs:
if: steps.check-hlsl.outputs.skip != 'true'
uses: ./.github/actions/setup-build-environment
with:
cache-key-suffix: "validation-${{ matrix.config.name }}${{ inputs.cache-key-suffix }}"
cache-key-suffix: "validation${{ inputs.cache-key-suffix }}"
- name: Prepare shaders
if: steps.check-hlsl.outputs.skip != 'true'
uses: ./.github/actions/prepare-shaders
Expand Down Expand Up @@ -185,21 +179,21 @@ jobs:
}
}

- name: Validate shader compilation (${{ matrix.config.name }})
- name: Validate shader compilation
if: steps.check-hlsl.outputs.skip != 'true'
shell: bash
run: |
if [ -z "${{ steps.find_fxc.outputs.fxc_path }}" ]; then
echo "fxc.exe not found - shader validation requires fxc.exe. Set --fxc to a valid path or ensure fxc.exe is in PATH." >&2
exit 1
fi
hlslkit-compile --fxc "${{ steps.find_fxc.outputs.fxc_path }}" --shader-dir build/ALL/aio/Shaders --output-dir build/ShaderCache --config ${{ matrix.config.file }} --max-warnings 0 --suppress-warnings X1519
hlslkit-compile --fxc "${{ steps.find_fxc.outputs.fxc_path }}" --shader-dir build/ALL/aio/Shaders --output-dir build/ShaderCache --config .github/configs/shader-validation.yaml --max-warnings 0 --suppress-warnings X1519

- name: Upload shader validation logs
if: failure() && steps.check-hlsl.outputs.skip != 'true'
uses: actions/upload-artifact@v7
with:
name: shader-validation-logs-${{ matrix.config.name }}
name: shader-validation-logs
path: |
build/ShaderCache/new_issues.log
build/ShaderCache/*.log
Expand Down
Loading