Skip to content

Commit 18e6611

Browse files
Parad0x84csyonghe
andauthored
fix trimming of "v" from version string (shader-slang#6605)
Current releases are removing "v" from "vulkan-sdk-1.4.309.0" when they were supposed to remove it from something like "v1.2.4" https://github.com/shader-slang/slang/releases/tag/vulkan-sdk-1.4.309.0 Fixed it so it only removes "v", if next character is a number Co-authored-by: Yong He <yonghe@outlook.com>
1 parent 78517dc commit 18e6611

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/release-linux-glibc-2-17.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ jobs:
3535
id: package
3636
run: |
3737
triggering_ref=${{ github.ref_name }}
38-
version=${triggering_ref#v}
38+
if [[ $triggering_ref =~ ^v[0-9] ]]; then
39+
version=${triggering_ref#v}
40+
else
41+
version=$triggering_ref
42+
fi
3943
base=$(pwd)/slang-${version}-linux-x86_64-glibc-2.17
4044
4145
sudo mv "$(pwd)/build/dist-release/slang.zip" "${base}.zip"

.github/workflows/release.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,12 @@ jobs:
169169
cpack --preset "$config-debug-info" -G TGZ
170170
171171
triggering_ref=${{ github.ref_name }}
172-
base=slang-${triggering_ref#v}-${{matrix.os}}-${{matrix.platform}}
172+
if [[ $triggering_ref =~ ^v[0-9] ]]; then
173+
version=${triggering_ref#v}
174+
else
175+
version=$triggering_ref
176+
fi
177+
base=slang-${version}-${{matrix.os}}-${{matrix.platform}}
173178
174179
# Move main packages
175180
mv "$(pwd)/build/dist-${config}/slang.zip" "${base}.zip"

0 commit comments

Comments
 (0)