From a9a6b9feffda06e23cdaaae9a92433599950c375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 6 Apr 2024 20:05:27 +0200 Subject: [PATCH] Back to building --- .github/workflows/mac-builds-m1.yml | 45 ++++++++++++++--------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/mac-builds-m1.yml b/.github/workflows/mac-builds-m1.yml index 4274b51eba..4820466d40 100644 --- a/.github/workflows/mac-builds-m1.yml +++ b/.github/workflows/mac-builds-m1.yml @@ -20,26 +20,25 @@ jobs: - uses: actions/checkout@v4 - name: Configure build - run: echo "hello world" -# working-directory: ${{runner.workspace}} -# env: -# CXX: ${{matrix.cxx}} -# CXXFLAGS: ${{matrix.cxxflags}} -# run: | -# cmake -Bbuild -H$GITHUB_WORKSPACE \ -# -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ -# -DCMAKE_CXX_STANDARD=${{matrix.std}} \ -# -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -# -DCATCH_DEVELOPMENT_BUILD=ON \ -# -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \ -# -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}} -# -# - name: Build tests + lib -# working-directory: ${{runner.workspace}}/build -# run: make -j `sysctl -n hw.ncpu` -# -# - name: Run tests -# env: -# CTEST_OUTPUT_ON_FAILURE: 1 -# working-directory: ${{runner.workspace}}/build -# run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu` + working-directory: ${{runner.workspace}} + env: + CXX: ${{matrix.cxx}} + CXXFLAGS: ${{matrix.cxxflags}} + run: | + cmake -Bbuild -H$GITHUB_WORKSPACE \ + -DCMAKE_BUILD_TYPE=${{matrix.build_type}} \ + -DCMAKE_CXX_STANDARD=${{matrix.std}} \ + -DCMAKE_CXX_STANDARD_REQUIRED=ON \ + -DCATCH_DEVELOPMENT_BUILD=ON \ + -DCATCH_BUILD_EXAMPLES=${{matrix.examples}} \ + -DCATCH_BUILD_EXTRA_TESTS=${{matrix.examples}} + + - name: Build tests + lib + working-directory: ${{runner.workspace}}/build + run: make -j `sysctl -n hw.ncpu` + + - name: Run tests + env: + CTEST_OUTPUT_ON_FAILURE: 1 + working-directory: ${{runner.workspace}}/build + run: ctest -C ${{matrix.build_type}} -j `sysctl -n hw.ncpu`