[ci][docs] Update docs, update build flow

ostis-ai · Apr 5, 2022 · 54d16be · 54d16be
1 parent 4118e25
commit 54d16be
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/docs/build/linux-build.md b/docs/build/linux-build.md
@@ -41,7 +41,7 @@ cd sc-machine
 ./scripts/ci/make-tests.sh
 ```
 
-## CLangFormat code check
+## Code formatting with CLangFormat
 
 To check code with CLangFormat run:
 ```shell
@@ -52,6 +52,12 @@ cmake .. -DSC_CLANG_FORMAT_CODE=ON
 make clangformat_check
 ```
 
+or
+```shell
+cd sc-machine
+./scripts/ci/check-formatting.sh
+```
+
 To format code with CLangFormat run:
 ```shell
 cd sc-machine
@@ -60,8 +66,3 @@ cd build
 cmake .. -DSC_CLANG_FORMAT_CODE=ON
 make clangformat
 ```
-or
-```shell
-cd sc-machine
-./scripts/ci/check-formatting.sh
-```
diff --git a/scripts/ci/check-formatting.sh b/scripts/ci/check-formatting.sh
@@ -2,8 +2,5 @@
 
 set -eo pipefail
 
-mkdir build -p
-pushd build
-cmake .. -DSC_CLANG_FORMAT_CODE=ON
-make clangformat_check
-popd
+cmake -B build -DSC_CLANG_FORMAT_CODE=ON
+cmake --build build --target clangformat_check
diff --git a/scripts/ci/make-tests.sh b/scripts/ci/make-tests.sh
@@ -4,14 +4,11 @@ set -eo pipefail
 
 pip3 install --user -r requirements.txt
 
-mkdir build -p
-pushd build
-
-cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DSC_COVERAGE=${COVERAGE} -DSC_AUTO_TEST=ON -DSC_BUILD_TESTS=ON -DSC_KPM_SCP=OFF
+cmake -B build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DSC_COVERAGE=${COVERAGE} -DSC_AUTO_TEST=ON -DSC_BUILD_TESTS=ON -DSC_KPM_SCP=OFF
 echo ::group::Make
-make -j$(nproc)
+cmake --build build -j$(nproc)
 echo ::endgroup::
 
+pushd build
 ../bin/sc-builder -i ../tools/builder/tests/kb -o ../bin/sc-builder-test-repo -c -f
-
-popd
+popd