This is an automated email from the ASF dual-hosted git repository.
xiaokang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-graphar.git
The following commit(s) were added to refs/heads/main by this push:
new 83b44b1d fix(ci): replace make with ninja. (#885)
83b44b1d is described below
commit 83b44b1d21fd91e731c856c8c3f826cc6dbc6fc1
Author: Jason Yao <[email protected]>
AuthorDate: Mon Mar 2 13:06:10 2026 +0800
fix(ci): replace make with ninja. (#885)
* fix(ci): replace make with ninja.
Signed-off-by: syaojun <[email protected]>
* fix(ci): fix the cpplint
Signed-off-by: syaojun <[email protected]>
* fix(ci): fix the cpplint2
Signed-off-by: syaojun <[email protected]>
* feat(ci): keep a make command
Signed-off-by: syaojun <[email protected]>
* feat(ci): keep a make command2
Signed-off-by: syaojun <[email protected]>
---------
Signed-off-by: syaojun <[email protected]>
---
.github/workflows/ci-nightly.yml | 14 +++++++-------
.github/workflows/ci.yml | 31 ++++++++++++++-----------------
cpp/Brewfile | 1 +
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/ci-nightly.yml b/.github/workflows/ci-nightly.yml
index 98db670f..754c080f 100644
--- a/.github/workflows/ci-nightly.yml
+++ b/.github/workflows/ci-nightly.yml
@@ -47,7 +47,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get update -y
- sudo apt-get install -y libboost-graph-dev ccache libcurl4-openssl-dev
+ sudo apt-get install -y libboost-graph-dev ccache libcurl4-openssl-dev
ninja-build
# install Catch2 v3
git clone --branch v3.6.0 https://github.com/catchorg/Catch2.git
--depth 1
@@ -62,14 +62,14 @@ jobs:
run: |
mkdir build-debug
pushd build-debug
- cmake ../cpp -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_ARROW_FROM_SOURCE=ON
+ cmake ../cpp -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_ARROW_FROM_SOURCE=ON
popd
- name: Build GraphAr-debug
run: |
pushd build-debug
- make -j$(nproc)
- make graphar-ccache-stats
+ ninja
+ ninja graphar-ccache-stats
popd
- name: Test-debug
@@ -83,14 +83,14 @@ jobs:
run: |
mkdir build-release
pushd build-release
- cmake ../cpp -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_ARROW_FROM_SOURCE=ON
+ cmake ../cpp -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo
-DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_ARROW_FROM_SOURCE=ON
popd
- name: Build GraphAr-release
run: |
pushd build-release
- make -j$(nproc)
- make graphar-ccache-stats
+ ninja
+ ninja graphar-ccache-stats
popd
- name: Test-release
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2cf98832..63c70b5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
libarrow-dataset-dev=17.0.0-1 \
libarrow-acero-dev=17.0.0-1 \
libparquet-dev=17.0.0-1
- sudo apt-get install -y libboost-graph-dev ccache libcurl4-openssl-dev
doxygen lcov
+ sudo apt-get install -y libboost-graph-dev ccache libcurl4-openssl-dev
doxygen lcov ninja-build
# install benchmark
git clone --branch v1.8.3 https://github.com/google/benchmark.git
--depth 1
@@ -94,7 +94,7 @@ jobs:
run: |
mkdir build
cd build
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
-DBUILD_BENCHMARKS=ON -DGRAPHAR_ENABLE_COVERAGE=ON
+ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON -DGRAPHAR_ENABLE_COVERAGE=ON
- name: clang-format
run: |
@@ -111,14 +111,11 @@ jobs:
- name: cpplint
working-directory: "cpp/build"
run: |
- function ec() { [[ "$1" == "-h" ]] && { shift && eval $* > /dev/null
2>&1; ec=$?; echo $ec; } || eval $*; ec=$?; }
-
- ec make graphar-cpplint
- if [[ "$ec" != "0" ]]; then
+ if ! ninja graphar-cpplint; then
echo
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "| cpplint failures found! Run: "
echo "|"
- echo "| make graphar-cpplint"
+ echo "| ninja graphar-cpplint"
echo "|"
echo "| to fix this error."
echo
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
@@ -129,11 +126,11 @@ jobs:
working-directory: "cpp/build"
run: |
cmake -DENABLE_DOCS=ON ..
- make docs
+ ninja docs
- name: Build GraphAr
working-directory: "cpp/build"
- run: make -j$(nproc)
+ run: ninja
- name: Test
working-directory: "cpp/build"
@@ -167,8 +164,8 @@ jobs:
run: |
mkdir build-release
pushd build-release
- cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
- make -j$(nproc)
+ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
+ ninja
export ASAN_OPTIONS=detect_leaks=0
ctest --output-on-failure
popd
@@ -232,8 +229,8 @@ jobs:
run: |
mkdir build
pushd build
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
-DBUILD_BENCHMARKS=ON
- make -j$(nproc)
+ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
+ ninja
popd
- name: Running Test
@@ -247,8 +244,8 @@ jobs:
run: |
mkdir build-release
pushd build-release
- cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
- make -j$(nproc)
+ cmake .. -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTS=ON
-DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
+ ninja
export ASAN_OPTIONS=detect_leaks=0
ctest --output-on-failure
popd
@@ -265,8 +262,8 @@ jobs:
run: |
mkdir build-static
pushd build-static
- cmake .. -DUSE_STATIC_ARROW=ON -DCMAKE_BUILD_TYPE=Debug
-DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
- make -j$(nproc)
+ cmake .. -G Ninja -DUSE_STATIC_ARROW=ON -DCMAKE_BUILD_TYPE=Debug
-DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BENCHMARKS=ON
+ ninja
export ASAN_OPTIONS=detect_leaks=0
export ASAN_OPTIONS=detect_container_overflow=0
ctest --output-on-failure
diff --git a/cpp/Brewfile b/cpp/Brewfile
index 889d3c90..fb5eecbe 100644
--- a/cpp/Brewfile
+++ b/cpp/Brewfile
@@ -16,6 +16,7 @@
# under the License.
brew "cmake"
+brew "ninja"
brew "google-benchmark"
brew "apache-arrow"
brew "boost"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
