diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index b20dce3..09d69fb 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -11,22 +11,22 @@ jobs: steps: - uses: actions/checkout@v2 # repo checkout - - uses: mymindstorm/setup-emsdk@v11 # setup emscripten toolchain + - uses: mymindstorm/setup-emsdk@v11 with: version: 3.1.57 - - uses: actions-rs/toolchain@v1 # get rust toolchain for wasm + - uses: actions-rs/toolchain@v1 with: toolchain: stable target: wasm32-unknown-emscripten override: true # TODO: Update to v2 - - name: Rust Cache # cache the rust build artefacts + - name: Rust Cache uses: Swatinem/rust-cache@v1 - name: Build # build - run: ./scripts/build.sh -r + run: ./scripts/build.sh -er # release, skip emsdk - name: Upload Artifact uses: actions/upload-pages-artifact@v2 diff --git a/scripts/build.sh b/scripts/build.sh index 6ad8956..2a1164e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -3,33 +3,39 @@ set -eu release='false' serve='false' +skip_emsdk='false' 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 - case "${flag}" in +while getopts 'erds' flag; do + case "${flag}" in + e) skip_emsdk='true' ;; r) release='true' ;; d) release='false' ;; s) serve='true' ;; - *) print_usage - exit 1 ;; - esac + *) + print_usage + exit 1 + ;; + esac done -echo "Activating Emscripten" -./../emsdk/emsdk activate latest -source ../emsdk/emsdk_env.sh -export EMCC_CFLAGS="-s USE_SDL=2" +if [ "$skip_emsdk" = 'false' ]; then + echo "Activating Emscripten" + ./../emsdk/emsdk activate latest + source ../emsdk/emsdk_env.sh + export EMCC_CFLAGS="-s USE_SDL=2" +fi echo "Building WASM with Emscripten" build_type='debug' if [ "$release" = 'true' ]; then - cargo build --target=wasm32-unknown-emscripten --release - build_type='release' + cargo build --target=wasm32-unknown-emscripten --release + build_type='release' else - cargo build --target=wasm32-unknown-emscripten + cargo build --target=wasm32-unknown-emscripten fi echo "Copying WASM files" @@ -40,6 +46,6 @@ cp $output_folder/pacman.wasm dist cp $output_folder/pacman.js dist if [ "$serve" = 'true' ]; then -echo "Serving WASM with Emscripten" - python3 -m http.server -d ./dist/ 8080 -fi \ No newline at end of file + echo "Serving WASM with Emscripten" + python3 -m http.server -d ./dist/ 8080 +fi