Merge pull request #2979 from spnda/master

Fix #2658: Properly include all headers in deployments
This commit is contained in:
Jeremy Hayes 2022-07-25 11:39:28 -06:00 committed by GitHub
commit 607771c362
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -77,17 +77,18 @@ jobs:
zip ${ARCHIVE} \
bin/glslangValidator \
include/glslang/* \
lib/libGenericCodeGen${SUFFIX}.a \
lib/libglslang${SUFFIX}.a \
lib/libglslang-default-resource-limits${SUFFIX}.a \
lib/libHLSL${SUFFIX}.a \
lib/libMachineIndependent${SUFFIX}.a \
lib/libOGLCompiler${SUFFIX}.a \
lib/libOSDependent${SUFFIX}.a \
lib/libSPIRV${SUFFIX}.a \
lib/libSPVRemapper${SUFFIX}.a \
lib/libSPIRV-Tools${SUFFIX}.a \
lib/libSPIRV-Tools-opt${SUFFIX}.a
include/glslang/**/* \
lib/libGenericCodeGen.a \
lib/libglslang.a \
lib/libglslang-default-resource-limits.a \
lib/libHLSL.a \
lib/libMachineIndependent.a \
lib/libOGLCompiler.a \
lib/libOSDependent.a \
lib/libSPIRV.a \
lib/libSPVRemapper.a \
lib/libSPIRV-Tools.a \
lib/libSPIRV-Tools-opt.a
- name: Deploy
if: ${{ matrix.compiler.cc == 'clang' }}
env:
@ -147,17 +148,18 @@ jobs:
zip ${ARCHIVE} \
bin/glslangValidator \
include/glslang/* \
lib/libGenericCodeGen${SUFFIX}.a \
lib/libglslang${SUFFIX}.a \
lib/libglslang-default-resource-limits${SUFFIX}.a \
lib/libHLSL${SUFFIX}.a \
lib/libMachineIndependent${SUFFIX}.a \
lib/libOGLCompiler${SUFFIX}.a \
lib/libOSDependent${SUFFIX}.a \
lib/libSPIRV${SUFFIX}.a \
lib/libSPVRemapper${SUFFIX}.a \
lib/libSPIRV-Tools${SUFFIX}.a \
lib/libSPIRV-Tools-opt${SUFFIX}.a
include/glslang/**/* \
lib/libGenericCodeGen.a \
lib/libglslang.a \
lib/libglslang-default-resource-limits.a \
lib/libHLSL.a \
lib/libMachineIndependent.a \
lib/libOGLCompiler.a \
lib/libOSDependent.a \
lib/libSPIRV.a \
lib/libSPVRemapper.a \
lib/libSPIRV-Tools.a \
lib/libSPIRV-Tools-opt.a
- name: Deploy
env:
ARCHIVE: glslang-master-${{matrix.os.family}}-${{matrix.cmake_build_type}}.zip