From eb874746ae50d59cdf0764a0daee3c2c92bc19a6 Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Thu, 4 Jul 2024 14:41:41 -0400 Subject: Tweak job --- .github/workflows/test.yml | 52 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e0c8853..f7ec68d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,32 +4,7 @@ on: [push, pull_request] jobs: build: - runs-on: ${{ matrix.os }} - - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest, windows-latest] - build_type: [Release] - c_compiler: [gcc, clang, cl] - include: - - os: windows-latest - c_compiler: cl - cpp_compiler: cl - - os: ubuntu-latest - c_compiler: gcc - cpp_compiler: g++ - - os: ubuntu-latest - c_compiler: clang - cpp_compiler: clang++ - exclude: - - os: windows-latest - c_compiler: gcc - - os: windows-latest - c_compiler: clang - - os: ubuntu-latest - c_compiler: cl - + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 @@ -39,30 +14,17 @@ jobs: run: | echo "path=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - name: Install dependencies on Ubuntu - if: runner.os == 'Linux' + - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y cmocka cmake - - - name: Install dependencies on Windows - if: runner.os == 'Windows' - run: | - choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' - choco install cmocka - + sudo apt-get install -y libcmocka-dev + - name: Configure CMake - run: > - cmake -B ${{ steps.build-output-dir.outputs.path }} - -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} + run: cmake -B ${{ steps.build-output-dir.outputs.path }} -S ${{ github.workspace }} - name: Build - # Note: --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }} + run: cmake --build ${{ steps.strings.outputs.build-output-dir }} - name: Test working-directory: ${{ steps.strings.outputs.build-output-dir }} - run: ctest --build-config ${{ matrix.build_type }} + run: ctest -- cgit v1.2.3