[ci][scripts] Remove duplicating build tests scripts

ostis-ai · Nov 15, 2024 · 77eb7ed · 77eb7ed
1 parent e66968b
commit 77eb7ed
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 33 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -47,15 +47,15 @@ jobs:
           BUILD_TYPE: ${{ matrix.config.build_type }}
           COVERAGE: ON
           SANITIZER_TYPE: none
-        run: scripts/ci/make_tests.sh
+        run: scripts/build_sc_machine.sh --cmake-arg "-DSC_COVERAGE=ON" -t
 
       - name: Prepare coverage
         id: prepare_coverage
         run: scripts/ci/prepare_coverage.sh
 
       - name: Run tests
         id: run_tests
-        run: scripts/ci/run_tests.sh
+        run: scripts/run_tests.sh
 
       - name: Export coverage report
         id: export_coverage

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -43,15 +43,15 @@ jobs:
           BUILD_TYPE: ${{ matrix.build_type }}
           COVERAGE: OFF
           SANITIZER_TYPE: none
-        run: scripts/ci/make_tests.sh
+        run: scripts/build_sc_machine.sh -t
 
       - name: Run tests
         id: run_tests
-        run: scripts/ci/run_tests.sh
+        run: scripts/run_tests.sh
 
       - name: Run sc-machine
         id: run_sc_machine
         run: |
           mkdir kb
-          bin/sc-builder -i kb -o kb.bin --clear
-          bin/sc-machine -t -c sc-machine.ini -s kb.bin
+          build/bin/sc-builder -i kb -o kb.bin --clear
+          build/bin/sc-machine -t -c sc-machine.ini -s kb.bin
diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -47,8 +47,8 @@ jobs:
           BUILD_TYPE: ${{ matrix.config.build_type }}
           COVERAGE: OFF
           SANITIZER_TYPE: ${{ matrix.config.sanitizer }}
-        run: scripts/ci/make_tests.sh
+        run: scripts/build_sc_machine.sh -t
 
       - name: Run tests
         id: run_tests
-        run: scripts/ci/run_tests.sh
+        run: scripts/run_tests.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.24)
 set(CMAKE_CXX_STANDARD 17)
-project(sc-machine VERSION "0.9.0")
+project(sc-machine VERSION "0.9.0" LANGUAGES C CXX)
 message(STATUS "Current Project Version: ${CMAKE_PROJECT_VERSION}")
 site_name(www.ostis.net)
 cmake_policy(SET CMP0048 NEW)
@@ -10,8 +10,8 @@ set(SC_MACHINE_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_MODULE_PATH "${SC_MACHINE_ROOT}/cmake")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+message(STATUS "Libary output directory: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 message(STATUS "Binary output directory: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-message(STATUS "Libary output directory: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 set(SC_MACHINE_THIRDPARTY_PATH "${SC_MACHINE_ROOT}/thirdparty")
 
 option(SC_BUILD_TESTS "Flag to build unit tests" OFF)
@@ -110,7 +110,6 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 include(${CMAKE_MODULE_PATH}/FindGLIB.cmake)
 
-set(SC_CORE_SRC "${SC_MACHINE_ROOT}/sc-memory/sc-core/src")
 add_subdirectory(${SC_MACHINE_ROOT}/thirdparty)
 add_subdirectory(${SC_MACHINE_ROOT}/sc-memory)
 add_subdirectory(${SC_MACHINE_ROOT}/sc-kpm)

diff --git a/sc-tools/sc-server/CMakeLists.txt b/sc-tools/sc-server/CMakeLists.txt
@@ -1,3 +1,5 @@
+set(SC_CORE_SRC "${SC_MACHINE_ROOT}/sc-memory/sc-core/src")
+
 file(GLOB SOURCES CONFIGURE_DEPENDS
     "src/*.cpp" "src/*.hpp"
     "src/*/*.cpp" "src/*/*.hpp"

diff --git a/scripts/ci/make_tests.sh b/scripts/ci/make_tests.sh
diff --git a/scripts/ci/run_tests.sh b/scripts/ci/run_tests.sh
diff --git a/scripts/set_vars.sh b/scripts/set_vars.sh
@@ -8,7 +8,7 @@ export ROOT_CMAKE_PATH="${ROOT_CMAKE_PATH:-${SC_MACHINE_PATH}}"
 export PROBLEM_SOLVER_PATH="${PROBLEM_SOLVER_PATH:-${SC_MACHINE_PATH}}" # backward compatibility
 export CXX_SOURCES_PATH="${PROBLEM_SOLVER_PATH:-${SC_MACHINE_PATH}}"
 export BUILD_PATH="${BUILD_PATH:-${ROOT_CMAKE_PATH}/build}"
-export BINARY_PATH="${BINARY_PATH:-${ROOT_CMAKE_PATH}/bin}"
+export BINARY_PATH="${BINARY_PATH:-${BUILD_PATH}/bin}"
 
 export CONFIG_PATH="${CONFIG_PATH:-${SC_MACHINE_PATH}/sc-machine.ini}"
 export REPO_PATH="${REPO_PATH:-${SC_MACHINE_PATH}/repo.path}"