diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index ad00559..8294707 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -31,15 +31,6 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set reusable strings - # Turn repeated input strings (such as the build output directory) into step outputs. - # These step outputs can be used throughout the workflow file. - # - id: strings - shell: bash - run: > - echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - name: Cache Google Test id: cache-google-test uses: actions/cache@v2 @@ -73,33 +64,19 @@ jobs: git clone https://github.com/google/benchmark.git mkdir benchmark/build cd benchmark/build - cmake .. + cmake .. -DBENCHMARK_ENABLE_TESTING=OFF sudo make install + # Configure CMake in a 'build' subdirectory. + # `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + # - name: Configure CMake - # Configure CMake in a 'build' subdirectory. - # `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. - # https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - # - run: > - cmake -B ${{ steps.strings.outputs.build-output-dir }} - -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} - -DCMAKE_CXX_STANDARD=${{ matrix.cpp_standard }} - -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} - - - name: Build and test - # Build your program with the given configuration. - # --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 }} - - - name: Test - working-directory: ${{ steps.strings.outputs.build-output-dir }} - # Execute tests defined by the CMake configuration. - # --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator). - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html - # - run: > - ctest --build-config ${{ matrix.build_type }} + run: | + cmake -S ${{ github.workspace }} -B ${{ github.workspace }}/build \ + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \ + -DCMAKE_CXX_STANDARD=${{ matrix.cpp_standard }} \ + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + cd ${{ github.workspace }}/build + make + ./bin/utest