From f4efce5cdc5c1facae8487be7eee40575817b7e1 Mon Sep 17 00:00:00 2001 From: Jaromil Date: Mon, 11 Nov 2024 16:58:43 +0100 Subject: [PATCH] fix: emscripten version pinned to 3.1.71 with node 20.18 --- .github/workflows/main.yml | 10 +++++----- build/meson.build | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b34166566..1a73e6f20 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,9 +228,9 @@ jobs: if: "!contains(github.event.pull_request.labels.*.name, 'SKIP_JS') && github.event_name == 'pull_request'" strategy: matrix: - node-version: [20.x] + node-version: [20.18.0] env: - EM_VERSION: latest + EM_VERSION: 3.1.71 steps: - uses: actions/checkout@v4 with: @@ -334,20 +334,20 @@ jobs: if: ${{ needs.semantic-release.outputs.release == 'True' }} runs-on: ubuntu-latest env: - EM_VERSION: 3.1.59 + EM_VERSION: 3.1.71 steps: - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: actions/setup-node@v4 with: - node-version: 20.x + node-version: 20.18.0 - uses: mymindstorm/setup-emsdk@v14 with: version: ${{ env.EM_VERSION }} - name: Build Zenroom Wasm run: | - make node-wasm RELEASE=1 + make node-wasm RELEASE=1 CCACHE=1 env: EMSCRIPTEN: ${{ env.EMSDK }}/upstream/emscripten - uses: actions/upload-artifact@v4 diff --git a/build/meson.build b/build/meson.build index bdf676d94..bf0f39096 100644 --- a/build/meson.build +++ b/build/meson.build @@ -52,7 +52,7 @@ foreach test_suite : tests test('lua_'+test_suite.underscorify(), bats_bin, args: [test_dir+'lua/'+test_suite+'.bats'], - timeout: 120 + timeout: 240 ) endforeach endif