Try using ninja in the build ci setup

This commit is contained in:
Jeremy 2024-07-13 22:50:18 -05:00
parent a2f1812896
commit 2ae193256d
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
2 changed files with 8 additions and 4 deletions

View File

@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- name: dependencies
run: |
sudo apt install gcc-10 g++-10 libgcc-10-dev libunwind8-dev
sudo apt install gcc-10 g++-10 libgcc-10-dev libunwind8-dev ninja-build
pip3 install colorama
- name: libdwarf
run: |
@ -34,6 +34,7 @@ jobs:
- uses: actions/checkout@v4
- name: dependencies
run: |
brew install ninja
python3 -m venv env
env/bin/pip install colorama
- name: libdwarf
@ -76,7 +77,7 @@ jobs:
- uses: actions/checkout@v4
- name: dependencies
run: |
sudo apt install gcc-10 g++-10 libgcc-10-dev libunwind8-dev
sudo apt install gcc-10 g++-10 libgcc-10-dev libunwind8-dev ninja-build
pip3 install colorama
- name: libdwarf
run: |
@ -96,6 +97,7 @@ jobs:
- uses: actions/checkout@v4
- name: dependencies
run: |
brew install ninja
python3 -m venv env
env/bin/pip install colorama
- name: libdwarf

View File

@ -24,6 +24,7 @@ def build(runner: MatrixRunner):
succeeded = runner.run_command(
"cmake",
"..",
"-GNinja",
f"-DCMAKE_BUILD_TYPE={matrix['target']}",
f"-DCMAKE_CXX_COMPILER={matrix['compiler']}",
f"-DCMAKE_CXX_STANDARD={matrix['std']}",
@ -36,7 +37,7 @@ def build(runner: MatrixRunner):
"-DCPPTRACE_BACKTRACE_PATH=/usr/lib/gcc/x86_64-linux-gnu/10/include/backtrace.h",
)
if succeeded:
succeeded = runner.run_command("make", "-j", "VERBOSE=1")
succeeded = runner.run_command("ninja")
else:
args = [
"cmake",
@ -78,6 +79,7 @@ def build_full_or_auto(runner: MatrixRunner):
args = [
"cmake",
"..",
"-GNinja",
f"-DCMAKE_BUILD_TYPE={matrix['target']}",
f"-DCMAKE_CXX_COMPILER={matrix['compiler']}",
f"-DCMAKE_CXX_STANDARD={matrix['std']}",
@ -90,7 +92,7 @@ def build_full_or_auto(runner: MatrixRunner):
args.append(f"{matrix['config']}")
succeeded = runner.run_command(*args)
if succeeded:
succeeded = runner.run_command("make", "-j")
succeeded = runner.run_command("ninja")
else:
args = [
"cmake",