From 7d81631d2165d01f69f1b7c76a6cb1efda304e42 Mon Sep 17 00:00:00 2001 From: Igor Machado Date: Mon, 13 Nov 2023 01:27:43 +0000 Subject: [PATCH] feat: using cmake on test --- .github/workflows/multiplatform.yml | 10 +++++++--- makefile | 11 +++++++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.github/workflows/multiplatform.yml b/.github/workflows/multiplatform.yml index c5e4440..a2ac11c 100644 --- a/.github/workflows/multiplatform.yml +++ b/.github/workflows/multiplatform.yml @@ -42,6 +42,10 @@ jobs: steps: - uses: actions/checkout@v3 - uses: ilammy/msvc-dev-cmd@v1 + - name: Install ninja-build (Ubuntu) + if: contains(matrix.os, 'ubuntu') + run: | + sudo apt-get install ninja-build -y - name: Git Submodules run: | git submodule update --init --recursive @@ -50,12 +54,12 @@ jobs: shell: bash run: | make load_thirdparty - - name: make test_local + - name: make optframe_lib_cmake shell: bash run: | - make test_local + make optframe_lib_cmake - name: make test_package shell: bash run: | - make test_local + make test_package diff --git a/makefile b/makefile index 620c750..593d6e3 100644 --- a/makefile +++ b/makefile @@ -35,6 +35,13 @@ optframe_lib: # #readelf -s build/optframe_lib.so | grep fcore +optframe_lib_cmake: + @echo "BUILD WITH CL (default)" + cmake -S. -Bbuild -GNinja + ninja -Cbuild + mv optframe/liboptframe_lib.so optframe/optframe_lib.so + + publish_test: rm -f dist/* python -m build @@ -61,7 +68,7 @@ demo_local_tiny: optframe/optframe_lib.so docs: cd docs && make clean && make html -test_local: load_thirdparty optframe_lib +test_local: load_thirdparty echo "" echo "Running DEV Demos as tests..." echo "" @@ -70,7 +77,7 @@ test_local: load_thirdparty optframe_lib (cd demo/03_QuickstartTSP_VNS_BRKGA/ && ./join.sh && python3 dev-mainTSP-fcore-ils.py > /dev/null) echo "Finished 'make test_local'" -test: test_local test_package +test: optframe_lib test_local test_package test_package: clean install # (cd demo/ && python3 demo_pyfcore.py)