@@ -27,13 +27,13 @@ jobs:
27
27
# These packages are already part of the ubuntu-20.04 image:
28
28
# clang-format-10 cmake gcc-10 g++-10 shellcheck libgmp-dev
29
29
# These aren't:
30
- run : sudo apt-get install libstdc++-10-dev libmpfr-dev libmpc-dev
30
+ run : sudo apt-get install libstdc++-10-dev libmpfr-dev libmpc-dev ninja-build
31
31
# If we ever do any qemu-emulation on Github Actions, we should re-enable this:
32
32
# e2fsprogs qemu-system-i386 qemu-utils
33
33
- name : Use GCC 10 instead
34
34
run : sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 --slave /usr/bin/g++ g++ /usr/bin/g++-10
35
35
- name : Check versions
36
- run : set +e; g++ --version; g++-10 --version; clang-format --version; clang-format-10 --version; python --version; python3 --version
36
+ run : set +e; g++ --version; g++-10 --version; clang-format --version; clang-format-10 --version; python --version; python3 --version; ninja --version
37
37
38
38
# === PREPARE FOR BUILDING ===
39
39
60
60
run : |
61
61
mkdir -p Build
62
62
cd Build
63
- cmake .. -DBUILD_LAGOM=1 -DALL_THE_DEBUG_MACROS=1
63
+ cmake .. -GNinja - DBUILD_LAGOM=1 -DALL_THE_DEBUG_MACROS=1
64
64
65
65
# === ACTUALLY BUILD AND TEST ===
66
66
@@ -72,13 +72,13 @@ jobs:
72
72
73
73
- name : Build Serenity and Tests
74
74
working-directory : ${{ github.workspace }}/Build
75
- run : cmake --build . -j2
75
+ run : cmake --build .
76
76
- name : Lint (Phase 2/2)
77
77
working-directory : ${{ github.workspace }}/Meta
78
78
run : ./check-symbols.sh
79
79
- name : Run CMake tests
80
80
working-directory : ${{ github.workspace }}/Build
81
- run : CTEST_OUTPUT_ON_FAILURE=1 make test
81
+ run : CTEST_OUTPUT_ON_FAILURE=1 ninja test
82
82
- name : Run JS tests
83
83
working-directory : ${{ github.workspace }}/Build/Meta/Lagom
84
84
run : DISABLE_DBG_OUTPUT=1 ./test-js
@@ -112,9 +112,11 @@ jobs:
112
112
- uses : actions/checkout@v2
113
113
114
114
# === OS SETUP ===
115
-
115
+ #
116
+ - name : Install dependencies
117
+ run : sudo apt-get install ninja-build
116
118
- name : Check versions
117
- run : set +e; clang --version; clang++ --version
119
+ run : set +e; clang --version; clang++ --version; ninja --version
118
120
119
121
# === PREPARE FOR BUILDING ===
120
122
@@ -126,10 +128,10 @@ jobs:
126
128
run : |
127
129
mkdir -p Build
128
130
cd Build
129
- cmake -DBUILD_LAGOM=ON -DENABLE_FUZZER_SANITIZER=ON -DENABLE_ADDRESS_SANITIZER=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
131
+ cmake -GNinja - DBUILD_LAGOM=ON -DENABLE_FUZZER_SANITIZER=ON -DENABLE_ADDRESS_SANITIZER=ON -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ ..
130
132
131
133
# === ACTUALLY BUILD ===
132
134
133
135
- name : Build Lagom with Fuzzers
134
136
working-directory : ${{ github.workspace }}/Meta/Lagom/Build
135
- run : cmake --build . -j2
137
+ run : cmake --build .
0 commit comments