From f8cb1d280549485243de545a1d11556a8b101ae5 Mon Sep 17 00:00:00 2001 From: Alexander Malkov Date: Thu, 8 Feb 2024 17:29:41 +0300 Subject: [PATCH] feat test: gh ci ninja --- .github/workflows/ci.yml | 5 ++--- .github/workflows/docker.yaml | 9 +++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f335375dbddf..1f12cacf0961 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -126,7 +126,7 @@ jobs: run: | mkdir build_debug cd build_debug - cmake ${{matrix.cmake-flags}} .. + cmake -GNinja ${{matrix.cmake-flags}} .. - name: Run clang-tidy if: matrix.info == 'clang-14 + debug + sanitize addr+ub' @@ -148,8 +148,7 @@ jobs: - name: Compile run: | pwd - cd build_debug - make -j$(nproc) + cmake --build build_debug/ - name: Run tests (universal) run: | diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index b536781fcd86..91faac61c441 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -76,12 +76,13 @@ jobs: && ccache -s' - name: Cmake - run: docker-compose run --rm ${{ matrix.image }} bash -c 'cmake -DUSERVER_GOOGLE_COMMON_PROTOS=/app/api-common-protos - ${{ matrix.cmake-flags }} -B./build -S./' + run: docker-compose run --rm ${{ matrix.image }} bash -c 'cmake -GNinja + -DUSERVER_GOOGLE_COMMON_PROTOS=/app/api-common-protos ${{ matrix.cmake-flags + }} -B./build -S./' - name: Build - run: docker-compose run --rm ${{ matrix.image }} bash -c 'cd /userver/build - && make -j $(nproc)' + run: docker-compose run --rm ${{ matrix.image }} bash -c 'cmake --build + /userver/build' - name: Run tests run: docker-compose run --rm ${{ matrix.image }} bash -c 'cd /userver/build