mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

ci: pin sokol-shdc.exe version to latest working (after new commit to floooh/sokol-tools-bin/, shdc fails to compile gouraud.glsl)

Browse Source
This commit is contained in:
Delyan Angelov 2022-01-08 17:35:52 +02:00
parent 83e9585d06
commit 70bf200e16
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -196,7 +196,7 @@ jobs:
- name: Shader examples can be build - name: Shader examples can be build
run: | run: |
wget https://github.com/floooh/sokol-tools-bin/raw/master/bin/linux/sokol-shdc wget https://github.com/floooh/sokol-tools-bin/raw/33d2e4cc26088c6c28eaef5467990f8940d15aab/bin/linux/sokol-shdc
chmod +x ./sokol-shdc chmod +x ./sokol-shdc
for f in examples/sokol/02_cubes_glsl/cube_glsl \ for f in examples/sokol/02_cubes_glsl/cube_glsl \
examples/sokol/03_march_tracing_glsl/rt_glsl \ examples/sokol/03_march_tracing_glsl/rt_glsl \

11
cmd/tools/vshader.v
View File

@ -18,9 +18,10 @@ import flag
import net.http import net.http
const ( const (
tool_name = os.file_name(os.executable()) shdc_full_hash = '33d2e4cc26088c6c28eaef5467990f8940d15aab'
tool_version = '0.0.1' tool_version = '0.0.1'
tool_description = "Compile shaders in sokol's annotated GLSL format to C headers for use with sokol based apps" tool_description = "Compile shaders in sokol's annotated GLSL format to C headers for use with sokol based apps"
tool_name = os.file_name(os.executable())
cache_dir = os.join_path(os.cache_dir(), 'v', tool_name) cache_dir = os.join_path(os.cache_dir(), 'v', tool_name)
runtime_os = os.user_os() runtime_os = os.user_os()
) )
@ -50,11 +51,11 @@ const (
'wgpu', 'wgpu',
] ]
shdc_version = '33d2e4cc' shdc_version = shdc_full_hash[0..8]
shdc_urls = { shdc_urls = {
'windows': 'https://github.com/floooh/sokol-tools-bin/raw/33d2e4cc26088c6c28eaef5467990f8940d15aab/bin/win32/sokol-shdc.exe' 'windows': 'https://github.com/floooh/sokol-tools-bin/raw/$shdc_full_hash/bin/win32/sokol-shdc.exe'
'macos': 'https://github.com/floooh/sokol-tools-bin/raw/33d2e4cc26088c6c28eaef5467990f8940d15aab/bin/osx/sokol-shdc' 'macos': 'https://github.com/floooh/sokol-tools-bin/raw/$shdc_full_hash/bin/osx/sokol-shdc'
'linux': 'https://github.com/floooh/sokol-tools-bin/raw/33d2e4cc26088c6c28eaef5467990f8940d15aab/bin/linux/sokol-shdc' 'linux': 'https://github.com/floooh/sokol-tools-bin/raw/$shdc_full_hash/bin/linux/sokol-shdc'
} }
shdc_version_file = os.join_path(cache_dir, 'sokol-shdc.version') shdc_version_file = os.join_path(cache_dir, 'sokol-shdc.version')
shdc = shdc_exe() shdc = shdc_exe()