From b2ff93282c2f7154c804634e4f5ccd9cef5159b9 Mon Sep 17 00:00:00 2001 From: Da Ma Date: Fri, 1 Nov 2024 18:50:43 -0400 Subject: [PATCH 1/3] Fix macOS runner to macos-latest and configure cmake --- .github/workflows/cmakeMac.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmakeMac.yml b/.github/workflows/cmakeMac.yml index d85b798..2e85aa1 100644 --- a/.github/workflows/cmakeMac.yml +++ b/.github/workflows/cmakeMac.yml @@ -18,7 +18,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: macos-11 + runs-on: macos-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -44,7 +44,7 @@ jobs: run: | export LDFLAGS="-L/usr/local/opt/openblas/lib" export CPPFLAGS="-I/usr/local/opt/openblas/include" - cmake -B ${{github.workspace}}/build -DNASOQ_BLAS_BACKEND=OpenBLAS -DCMAKE_BUILD_TYPE=Release + cmake -B ${{github.workspace}}/build -DNASOQ_BLAS_BACKEND=OpenBLAS -DNASOQ_USE_CLAPACK=ON -DCMAKE_BUILD_TYPE=Release From 51095c99d2a18890b8cd4f806de7b15b724747eb Mon Sep 17 00:00:00 2001 From: Da Ma <79146609+Da-Dylan-Ma@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:47:50 -0400 Subject: [PATCH 2/3] Update cmakeMac.yml with additional test catch2 --- .github/workflows/cmakeMac.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cmakeMac.yml b/.github/workflows/cmakeMac.yml index 2e85aa1..f5bf9af 100644 --- a/.github/workflows/cmakeMac.yml +++ b/.github/workflows/cmakeMac.yml @@ -58,3 +58,4 @@ jobs: ${{github.workspace}}/build/examples/NASOQ_Test ${{github.workspace}}/build/examples/NASOQ_Step_Test ${{github.workspace}}/build/examples/LBLSOMOD_Test + ${{github.workspace}}/build/tests/NASOQ_Catch2_Tests From 80de735a16e66aea1086a11ff971bb273eb9217e Mon Sep 17 00:00:00 2001 From: Da Ma <79146609+Da-Dylan-Ma@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:59:28 -0400 Subject: [PATCH 3/3] Update cmakeMac.yml --- .github/workflows/cmakeMac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmakeMac.yml b/.github/workflows/cmakeMac.yml index f5bf9af..6c59a62 100644 --- a/.github/workflows/cmakeMac.yml +++ b/.github/workflows/cmakeMac.yml @@ -50,7 +50,7 @@ jobs: - name: Build # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --target LBL_Test NASOQ_Test NASOQ_Step_Test LBLSOMOD_Test + run: cmake --build ${{github.workspace}}/build --target LBL_Test NASOQ_Test NASOQ_Step_Test LBLSOMOD_Test NASOQ_Catch2_Tests - name: run test 1 run: |