diff options
| author | glx22 <glx@openttd.org> | 2021-02-21 16:26:23 +0100 |
|---|---|---|
| committer | Loïc Guilloux <glx22@users.noreply.github.com> | 2021-02-24 17:54:24 +0100 |
| commit | 70e484591579640b05727e189cfe70ba7d2b4e51 (patch) | |
| tree | dfe8cb106d76241d05e996701100d15f7e0adc5d /.github/workflows/ci-build.yml | |
| parent | 90adac8f09c376718e1c3c60cdfacfcefaef3597 (diff) | |
| download | openttd-70e484591579640b05727e189cfe70ba7d2b4e51.tar.xz | |
Change: [Actions] Use only CMake, CTest and CPack
Diffstat (limited to '.github/workflows/ci-build.yml')
| -rw-r--r-- | .github/workflows/ci-build.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index b50e84136..2e5ad6e31 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -39,7 +39,7 @@ jobs: echo "::group::Build" echo "Running on $(nproc) cores" - make -j$(nproc) tools + cmake --build . -j $(nproc) --target tools echo "::endgroup::" - name: Install GCC problem matcher @@ -56,7 +56,7 @@ jobs: echo "::group::Build" echo "Running on $(nproc) cores" - emmake make -j$(nproc) + cmake --build . -j $(nproc) echo "::endgroup::" linux: @@ -134,13 +134,13 @@ jobs: echo "::group::Build" echo "Running on $(nproc) cores" - make -j$(nproc) + cmake --build . -j $(nproc) echo "::endgroup::" - name: Test run: | cd build - make -j$(nproc) test + ctest -j $(nproc) macos: name: Mac OS @@ -213,13 +213,13 @@ jobs: echo "::group::Build" echo "Running on $(sysctl -n hw.logicalcpu) cores" - make -j$(sysctl -n hw.logicalcpu) + cmake --build . -j $(sysctl -n hw.logicalcpu) echo "::endgroup::" - name: Test run: | cd build - make -j$(sysctl -n hw.logicalcpu) test + ctest -j $(sysctl -n hw.logicalcpu) windows: name: Windows @@ -307,4 +307,4 @@ jobs: shell: bash run: | cd ${GITHUB_WORKSPACE}/build - ctest -C Debug + ctest |