Skip to content

Commit

Permalink
ci: use ninja
Browse files Browse the repository at this point in the history
  • Loading branch information
yamt committed Apr 19, 2023
1 parent c0c644c commit 6c03670
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -263,15 +263,15 @@ jobs:
if: matrix.arch != 'native'
env:
ARCH: ${{matrix.arch}}
EXTRA_CMAKE_OPTIONS: ${{env.extra_cmake_options}} -DTOYWASM_TARBALL_SUFFIX=-${{matrix.name}}
EXTRA_CMAKE_OPTIONS: -G Ninja ${{env.extra_cmake_options}} -DTOYWASM_TARBALL_SUFFIX=-${{matrix.name}}
run: |
sudo -E ./cross/cross-setup.sh
./cross/cross-cmake-configure.sh
- name: cmake configure (native)
if: matrix.arch == 'native'
env:
EXTRA_CMAKE_OPTIONS: ${{env.extra_cmake_options}} -DTOYWASM_TARBALL_SUFFIX=-${{matrix.name}}
EXTRA_CMAKE_OPTIONS: -G Ninja ${{env.extra_cmake_options}} -DTOYWASM_TARBALL_SUFFIX=-${{matrix.name}}
run: |
cmake -B ${{env.builddir}} ${EXTRA_CMAKE_OPTIONS}
Expand Down Expand Up @@ -355,7 +355,7 @@ jobs:
- name: Build and test
env:
# Note: we don't care about tarball suffix for native build here.
EXTRA_CMAKE_OPTIONS: -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/dist -DTOYWASM_TARBALL_SUFFIX=-${{matrix.name}} ${{matrix.extra}}
EXTRA_CMAKE_OPTIONS: -G Ninja -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/dist -DTOYWASM_TARBALL_SUFFIX=-${{matrix.name}} ${{matrix.extra}}
run: ./wasm-on-wasm.sh

- name: Install
Expand Down

0 comments on commit 6c03670

Please sign in to comment.