Merge pull request #43 from aidanfnv/main

Update build scripts for emsdk 4.0.11 compatibility, pin that release for CI use

Author: Devon7925

.github/actions/build-wasm-deps/action.yml

@@ -14,10 +14,7 @@ runs:
       run: |
         sudo apt-get update
         sudo apt-get install -y ninja-build
-        if [ ! -d "emsdk" ]; then
-          git clone https://github.com/emscripten-core/emsdk.git
-          sed -i 's/\r$//' emsdk/emsdk emsdk/emsdk_env.sh
-        fi
+        source ./build_scripts/setup-emsdk.sh
 
     - name: get slang head commit
       shell: bash
@@ -30,12 +27,7 @@ runs:
     - name: get spirv-tool head commit
       shell: bash
       run: |
-        if [ ! -d "spirv-tools" ]; then
-          git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
-          pushd spirv-tools
-          git checkout vulkan-sdk-1.3.290.0
-          popd
-        fi
+        source ./build_scripts/setup-spirv-tools.sh
         git -C spirv-tools rev-parse HEAD > key-spirv-tool.txt
 
     - name: restore slang-wasm

build_scripts/setup-emsdk.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# Shared script to setup emsdk with pinned version
+EMSDK_TAG="4.0.11"
+
+echo "[$(date)] Setup emsdk ..."
+if [ ! -d emsdk ]; then
+	git clone --branch $EMSDK_TAG --depth 1 https://github.com/emscripten-core/emsdk.git
+fi

build_scripts/setup-spirv-tools.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Shared script to setup SPIRV Tools with pinned version
+SPIRV_TOOLS_TAG="vulkan-sdk-1.3.290.0"
+
+echo "[$(date)] Setup SPIRV Tools ..."
+if [ ! -d spirv-tools ]; then
+	git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
+fi
+
+pushd spirv-tools
+	git checkout $SPIRV_TOOLS_TAG
+popd 

build_scripts/slang-wasm-build.sh

@@ -12,11 +12,8 @@ do
 	fi
 done
 
-echo "[$(date)] Sync emsdk repo ..."
-if [ ! -d emsdk ]
-then
-	git clone https://github.com/emscripten-core/emsdk.git
-fi
+# Setup pinned emsdk version using shared script
+source ./build_scripts/setup-emsdk.sh
 
 pushd emsdk
 	sed -i 's/\r$//' emsdk emsdk_env.sh
@@ -46,7 +43,7 @@ sed -i '/^[[:space:]]*target_link_options(/,/^[[:space:]]*)/c\
         -sMODULARIZE=1\
         -sEXPORT_ES6=0\
     	-sSINGLE_FILE=1\
-  		-sENVIRONMENT="worker"\
+  		-sENVIRONMENT=worker\
         -sEXPORTED_RUNTIME_METHODS=['FS']\
     )' "source/slang-wasm/CMakeLists.txt"
 
@@ -107,7 +104,7 @@ sed -i '/^[[:space:]]*target_link_options(/,/^[[:space:]]*)/c\
         -sMODULARIZE=1\
         -sEXPORT_ES6=0\
         -sSINGLE_FILE=1\
-        -sENVIRONMENT="node"\
+        -sENVIRONMENT=node\
         -sEXPORTED_RUNTIME_METHODS=['FS']\
     )' "source/slang-wasm/CMakeLists.txt"
 

build_scripts/spirv-tool-wasm-build.sh

@@ -1,9 +1,7 @@
 #!/bin/bash
 
-if [ ! -d emsdk ]
-then
-    git clone https://github.com/emscripten-core/emsdk.git emsdk
-fi
+# Setup pinned emsdk version using shared script
+source ./build_scripts/setup-emsdk.sh
 
 pushd emsdk
 	sed -i 's/\r$//' emsdk emsdk_env.sh
@@ -12,19 +10,16 @@ pushd emsdk
 	source ./emsdk_env.sh
 popd
 
-if [ ! -d spirv-tools ]
-then
-	git clone https://github.com/KhronosGroup/SPIRV-Tools.git spirv-tools
-fi
+# Setup pinned SPIRV Tools version using shared script
+source ./build_scripts/setup-spirv-tools.sh
 
 pushd spirv-tools
-git checkout vulkan-sdk-1.3.290.0
 
 python3 utils/git-sync-deps
 
 # add an additional option to emcc command
 sed -i 's/\r$//' source/wasm/build.sh
-sed -i 's/-s MODULARIZE \\/-s MODULARIZE -s SINGLE_FILE -s ENVIRONMENT="worker"\\/' source/wasm/build.sh
+sed -i 's/-s MODULARIZE \\/-s MODULARIZE -s SINGLE_FILE -s ENVIRONMENT=worker\\/' source/wasm/build.sh
 
 bash -x source/wasm/build.sh
 
@@ -37,7 +32,7 @@ cp ../spirv-tools.d.ts ../spirv-tools.worker.d.ts
 
 # --- Build for Node.js ---
 # Patch build.sh for Node.js build
-sed -i 's/-s ENVIRONMENT="worker"/-s ENVIRONMENT="node"/' source/wasm/build.sh
+sed -i 's/-s ENVIRONMENT=worker/-s ENVIRONMENT=node/' source/wasm/build.sh
 
 bash -x source/wasm/build.sh