Skip to content

Commit

Permalink
CI: change emscripten to proper release version
Browse files Browse the repository at this point in the history
Allows easier updating of emscripten to specific versions
Update from 3.1.30 to 3.1.43
  • Loading branch information
wirew0rm committed Oct 9, 2023
1 parent 11618ac commit b1cb7c0
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,10 @@ jobs:
cd
git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
# Download and install the latest SDK tools.
./emsdk install releases-03ecb526947f6a3702a0d083083799fe410d3893-64bit
# Make the "latest" SDK "active" for the current user. (writes .emscripten file)
./emsdk activate releases-03ecb526947f6a3702a0d083083799fe410d3893-64bit
# Activate PATH and other environment variables in the current terminal
source ./emsdk_env.sh
# Download and install emscripten.
./emsdk install 3.1.43 # 01/2023 (latest = 3.1.46 -> 09/2023)
# Make "active" for the current user. (writes .emscripten file)
./emsdk activate 3.1.43
- name: Configure CMake
if: matrix.configurations.compiler != 'emscripten'
Expand All @@ -106,8 +104,9 @@ jobs:
# Use a bash shell, so we can use the same syntax for environment variable access regardless of the host operating system
shell: bash
run: |
export SYSTEM_NODE=`which node` # use system node instead of old version distributed with emsdk for threading support
source ~/emsdk/emsdk_env.sh
emcmake cmake -S . -B ../build -DCMAKE_BUILD_TYPE=${{ matrix.cmake-build-type }} -DENABLE_TESTING=ON
emcmake cmake -S . -B ../build -DCMAKE_BUILD_TYPE=${{ matrix.cmake-build-type }} -DENABLE_TESTING=ON -DCMAKE_CROSSCOMPILING_EMULATOR=${SYSTEM_NODE}
- name: Build
shell: bash
Expand Down

0 comments on commit b1cb7c0

Please sign in to comment.