Add EMSDK skip flag

This commit is contained in:
2024-04-14 01:37:54 -05:00
parent 903dedafd1
commit 90add5d032
2 changed files with 26 additions and 20 deletions

View File

@@ -11,22 +11,22 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 # repo checkout - uses: actions/checkout@v2 # repo checkout
- uses: mymindstorm/setup-emsdk@v11 # setup emscripten toolchain - uses: mymindstorm/setup-emsdk@v11
with: with:
version: 3.1.57 version: 3.1.57
- uses: actions-rs/toolchain@v1 # get rust toolchain for wasm - uses: actions-rs/toolchain@v1
with: with:
toolchain: stable toolchain: stable
target: wasm32-unknown-emscripten target: wasm32-unknown-emscripten
override: true override: true
# TODO: Update to v2 # TODO: Update to v2
- name: Rust Cache # cache the rust build artefacts - name: Rust Cache
uses: Swatinem/rust-cache@v1 uses: Swatinem/rust-cache@v1
- name: Build # build - name: Build # build
run: ./scripts/build.sh -r run: ./scripts/build.sh -er # release, skip emsdk
- name: Upload Artifact - name: Upload Artifact
uses: actions/upload-pages-artifact@v2 uses: actions/upload-pages-artifact@v2

View File

@@ -3,25 +3,31 @@ set -eu
release='false' release='false'
serve='false' serve='false'
skip_emsdk='false'
print_usage() { print_usage() {
printf "Usage: -r RELEASE -d DEBUG -s SERVE\n" printf "Usage: -r RELEASE -d DEBUG -s SERVE\n"
} }
while getopts 'rds' flag; do while getopts 'erds' flag; do
case "${flag}" in case "${flag}" in
e) skip_emsdk='true' ;;
r) release='true' ;; r) release='true' ;;
d) release='false' ;; d) release='false' ;;
s) serve='true' ;; s) serve='true' ;;
*) print_usage *)
exit 1 ;; print_usage
exit 1
;;
esac esac
done done
echo "Activating Emscripten" if [ "$skip_emsdk" = 'false' ]; then
./../emsdk/emsdk activate latest echo "Activating Emscripten"
source ../emsdk/emsdk_env.sh ./../emsdk/emsdk activate latest
export EMCC_CFLAGS="-s USE_SDL=2" source ../emsdk/emsdk_env.sh
export EMCC_CFLAGS="-s USE_SDL=2"
fi
echo "Building WASM with Emscripten" echo "Building WASM with Emscripten"
build_type='debug' build_type='debug'
@@ -40,6 +46,6 @@ cp $output_folder/pacman.wasm dist
cp $output_folder/pacman.js dist cp $output_folder/pacman.js dist
if [ "$serve" = 'true' ]; then if [ "$serve" = 'true' ]; then
echo "Serving WASM with Emscripten" echo "Serving WASM with Emscripten"
python3 -m http.server -d ./dist/ 8080 python3 -m http.server -d ./dist/ 8080
fi fi