From f6a2ab01a1d8dd73f9a0f7fe649705c1c4872115 Mon Sep 17 00:00:00 2001 From: Ricardo Antunes Date: Fri, 22 Nov 2024 19:52:03 +0100 Subject: [PATCH] try 1 --- .github/workflows/build-web.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index 9e00d99e3a..d16daf8dd4 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -11,7 +11,7 @@ env: BUILD_TYPE: Release CCACHE_BASEDIR: ${{ github.workspace }} CCACHE_DIR: "${{ github.workspace }}/.ccache" - CCACHE_COMPILERTYPE: gcc + CCACHE_COMPILERTYPE: emcc CMAKE_TOOLCHAIN_FILE: ${{ github.workspace }}/cmake/Emscripten.cmake jobs: @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Emscripten + - name: Install emsdk uses: mymindstorm/setup-emsdk@v14 - name: Install dependencies @@ -46,11 +46,8 @@ jobs: ccache- - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCUBOS_CORE_SAMPLES=ON -DCUBOS_ENGINE_SAMPLES=ON -DCMAKE_TOOLCHAIN_FILE=${{env.CMAKE_TOOLCHAIN_FILE}} + run: emcmake cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCUBOS_CORE_SAMPLES=ON -DCUBOS_ENGINE_SAMPLES=ON -DCMAKE_TOOLCHAIN_FILE=${{env.CMAKE_TOOLCHAIN_FILE}} shell: bash - env: - CC: emcc - CXX: em++ - name: CCache Prolog run: |- @@ -58,7 +55,7 @@ jobs: ccache -z # Zero cache entry - name: Build - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all + run: emcmake cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all - name: CCache Epilog run: |