diff options
| author | Sam Estep <sam@samestep.com> | 2025-08-18 12:02:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-18 16:02:37 +0000 |
| commit | e9a309678f55a59bb012a931af2c1b734968a13d (patch) | |
| tree | a29a0749a29b5fc3c17ad02513f1273161ec0d22 /extras | |
| parent | d9851d4e45d2344e0e220ef6199ef4e117066f0f (diff) | |
Fix error in IR stable names Git diff CI script (#7954)
#7644 added a script that gets run in CI to display a human-readable
diff if `source/slang/slang-ir-insts-stable-names.lua` needs to be
updated. However, the `git diff` commands in that script are wrong,
causing it to instead just display the man page for the `git diff`
command; [here's an
example](https://github.com/shader-slang/slang/actions/runs/16578560460/job/46888822691):
```
=== Updating stable names ===
Added 1 new instructions to source/slang/slang-ir-insts-stable-names.lua
=== Diff of changes made ===
usage: git diff --no-index [<options>] <path> <path>
Diff output format options
```
(followed by many lines)
This PR fixes the script. Here's an example showing it working correctly
after the fix:
-
https://github.com/shader-slang/slang/actions/runs/16578977233/job/46890240012
- https://github.com/shader-slang/slang/actions/runs/16578977233
Co-authored-by: Ellie Hermaszewska <ellieh@nvidia.com>
Diffstat (limited to 'extras')
| -rwxr-xr-x | extras/check-ir-stable-names-gh-actions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/check-ir-stable-names-gh-actions.sh b/extras/check-ir-stable-names-gh-actions.sh index 78c9945a6..8cd239ce2 100755 --- a/extras/check-ir-stable-names-gh-actions.sh +++ b/extras/check-ir-stable-names-gh-actions.sh @@ -11,7 +11,7 @@ if ! ./external/lua/lua extras/check-ir-stable-names.lua check; then ./external/lua/lua extras/check-ir-stable-names.lua update echo -e "\n=== Diff of changes made ===" - git diff --no-index --color=always source/slang/slang-ir-insts-stable-names.lua || true + git diff --color=always source/slang/slang-ir-insts-stable-names.lua || true # Also create a summary for GitHub Actions if [ -n "$GITHUB_STEP_SUMMARY" ]; then @@ -19,7 +19,7 @@ if ! ./external/lua/lua extras/check-ir-stable-names.lua check; then echo "## IR Stable Names Table Update Required" echo "The following changes need to be made to \`source/slang/slang-ir-insts-stable-names.lua\`:" echo '```diff' - git diff --no-index source/slang/slang-ir-insts-stable-names.lua + git diff source/slang/slang-ir-insts-stable-names.lua echo '```' } >>"$GITHUB_STEP_SUMMARY" fi |