From 79a9f7f652229a1af39b580b0abadba1f7ec6d02 Mon Sep 17 00:00:00 2001
From: Nathaniel Cesario <nathaniel@lunarg.com>
Date: Thu, 3 Aug 2023 16:44:28 -0600
Subject: [PATCH] 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
---
 .github/workflows/continuous_deployment.yml  | 7 +++++++
 .github/workflows/continuous_integration.yml | 1 +
 StandAlone/CMakeLists.txt                    | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/continuous_deployment.yml b/.github/workflows/continuous_deployment.yml
index 6425a040..aa546669 100644
--- a/.github/workflows/continuous_deployment.yml
+++ b/.github/workflows/continuous_deployment.yml
@@ -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/* `
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index 4b72962a..fb39a71c 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -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'
diff --git a/StandAlone/CMakeLists.txt b/StandAlone/CMakeLists.txt
index e25f5db8..b000cbd4 100644
--- a/StandAlone/CMakeLists.txt
+++ b/StandAlone/CMakeLists.txt
@@ -122,7 +122,7 @@ if(ENABLE_GLSLANG_INSTALL)
     # Create the same symlink at install time
     install(CODE "execute_process( \
                       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)
         install(TARGETS spirv-remap EXPORT glslang-targets)