mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix continuous deployment

Browse Source 
There should not be a '/' after $ENV{DESTDIR} in the cmake install script.

This change also:
- Uses lukka/get-cmake github action consistently across jobs
- Add the glslang binary to the continuous deployment archive
This commit is contained in:
Nathaniel Cesario 2023-08-03 16:44:28 -06:00 committed by arcady-lunarg
parent bfd96d3044
commit 79a9f7f652
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/continuous_deployment.yml vendored
View File

@ -48,6 +48,7 @@ jobs:
cmake_build_type: [Debug, Release] cmake_build_type: [Debug, Release]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: lukka/get-cmake@latest
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: '3.7' python-version: '3.7'
@ -90,6 +91,7 @@ jobs:
run: | run: |
cd build/install cd build/install
zip ${ARCHIVE} \ zip ${ARCHIVE} \
bin/glslang \
bin/glslangValidator \ bin/glslangValidator \
include/glslang/* \ include/glslang/* \
include/glslang/**/* \ include/glslang/**/* \
@ -126,6 +128,7 @@ jobs:
cmake_build_type: [Debug, Release] cmake_build_type: [Debug, Release]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: lukka/get-cmake@latest
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: '3.7' python-version: '3.7'
@ -163,6 +166,7 @@ jobs:
run: | run: |
cd build/install cd build/install
zip ${ARCHIVE} \ zip ${ARCHIVE} \
bin/glslang \
bin/glslangValidator \ bin/glslangValidator \
include/glslang/* \ include/glslang/* \
include/glslang/**/* \ include/glslang/**/* \
@ -197,6 +201,7 @@ jobs:
cmake_build_type: [Debug, Release] cmake_build_type: [Debug, Release]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: lukka/get-cmake@latest
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: '3.7' python-version: '3.7'
@ -231,6 +236,7 @@ jobs:
run: | run: |
cd build/install cd build/install
7z a ${{env.ARCHIVE}} ` 7z a ${{env.ARCHIVE}} `
bin/glslang.exe `
bin/glslangValidator.exe ` bin/glslangValidator.exe `
bin/spirv-remap.exe ` bin/spirv-remap.exe `
include/glslang/* ` include/glslang/* `
@ -252,6 +258,7 @@ jobs:
run: | run: |
cd build/install cd build/install
7z a ${{env.ARCHIVE}} ` 7z a ${{env.ARCHIVE}} `
bin/glslang.exe `
bin/glslangValidator.exe ` bin/glslangValidator.exe `
bin/spirv-remap.exe ` bin/spirv-remap.exe `
include/glslang/* ` include/glslang/* `

1
.github/workflows/continuous_integration.yml vendored
View File

@ -163,6 +163,7 @@ jobs:
cmake_build_type: [Debug, Release] cmake_build_type: [Debug, Release]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: lukka/get-cmake@latest
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: '3.7' python-version: '3.7'

2
StandAlone/CMakeLists.txt
View File

@ -122,7 +122,7 @@ if(ENABLE_GLSLANG_INSTALL)
# Create the same symlink at install time # Create the same symlink at install time
install(CODE "execute_process( \ install(CODE "execute_process( \
COMMAND ${CMAKE_COMMAND} -E ${link_method} $<TARGET_FILE_NAME:glslang-standalone> ${legacy_glslang_name} \ COMMAND ${CMAKE_COMMAND} -E ${link_method} $<TARGET_FILE_NAME:glslang-standalone> ${legacy_glslang_name} \
WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") WORKING_DIRECTORY \$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
if(ENABLE_SPVREMAPPER) if(ENABLE_SPVREMAPPER)
install(TARGETS spirv-remap EXPORT glslang-targets) install(TARGETS spirv-remap EXPORT glslang-targets)