Fix continuous deployment
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:
parent
bfd96d3044
commit
79a9f7f652
3 changed files with 9 additions and 1 deletions
7
.github/workflows/continuous_deployment.yml
vendored
7
.github/workflows/continuous_deployment.yml
vendored
|
|
@ -48,6 +48,7 @@ jobs:
|
|||
cmake_build_type: [Debug, Release]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: lukka/get-cmake@latest
|
||||
- uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.7'
|
||||
|
|
@ -90,6 +91,7 @@ jobs:
|
|||
run: |
|
||||
cd build/install
|
||||
zip ${ARCHIVE} \
|
||||
bin/glslang \
|
||||
bin/glslangValidator \
|
||||
include/glslang/* \
|
||||
include/glslang/**/* \
|
||||
|
|
@ -126,6 +128,7 @@ jobs:
|
|||
cmake_build_type: [Debug, Release]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: lukka/get-cmake@latest
|
||||
- uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.7'
|
||||
|
|
@ -163,6 +166,7 @@ jobs:
|
|||
run: |
|
||||
cd build/install
|
||||
zip ${ARCHIVE} \
|
||||
bin/glslang \
|
||||
bin/glslangValidator \
|
||||
include/glslang/* \
|
||||
include/glslang/**/* \
|
||||
|
|
@ -197,6 +201,7 @@ jobs:
|
|||
cmake_build_type: [Debug, Release]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: lukka/get-cmake@latest
|
||||
- uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.7'
|
||||
|
|
@ -231,6 +236,7 @@ jobs:
|
|||
run: |
|
||||
cd build/install
|
||||
7z a ${{env.ARCHIVE}} `
|
||||
bin/glslang.exe `
|
||||
bin/glslangValidator.exe `
|
||||
bin/spirv-remap.exe `
|
||||
include/glslang/* `
|
||||
|
|
@ -252,6 +258,7 @@ jobs:
|
|||
run: |
|
||||
cd build/install
|
||||
7z a ${{env.ARCHIVE}} `
|
||||
bin/glslang.exe `
|
||||
bin/glslangValidator.exe `
|
||||
bin/spirv-remap.exe `
|
||||
include/glslang/* `
|
||||
|
|
|
|||
1
.github/workflows/continuous_integration.yml
vendored
1
.github/workflows/continuous_integration.yml
vendored
|
|
@ -163,6 +163,7 @@ jobs:
|
|||
cmake_build_type: [Debug, Release]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: lukka/get-cmake@latest
|
||||
- uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.7'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue