|
43 | 43 | - "-DFLB_SANITIZE_MEMORY=On" |
44 | 44 | - "-DFLB_SANITIZE_THREAD=On" |
45 | 45 | compiler: |
46 | | - - gcc |
47 | | - - clang |
| 46 | + - gcc: |
| 47 | + cc: gcc |
| 48 | + cxx: g++ |
| 49 | + - clang: |
| 50 | + cc: clang |
| 51 | + cxx: clang++ |
48 | 52 | exclude: |
49 | 53 | - flb_option: "-DFLB_COVERAGE=On" |
50 | 54 | compiler: clang |
|
64 | 68 | repository: calyptia/fluent-bit-ci |
65 | 69 | path: ci |
66 | 70 |
|
67 | | - - name: ${{ matrix.compiler }} - ${{ matrix.flb_option }} |
| 71 | + - name: ${{ matrix.compiler.cc }} & ${{ matrix.compiler.cxx }} - ${{ matrix.flb_option }} |
68 | 72 | run: | |
69 | 73 | echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT" |
70 | 74 | sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 90 |
|
73 | 77 | sudo usermod -a -G systemd-journal $(id -un) |
74 | 78 | sudo -E su -p $(id -un) -c "PATH=$PATH ci/scripts/run-unit-tests.sh" |
75 | 79 | env: |
76 | | - CC: ${{ matrix.compiler }} |
77 | | - CXX: ${{ matrix.compiler }} |
| 80 | + CC: ${{ matrix.compiler.cc }} |
| 81 | + CXX: ${{ matrix.compiler.cxx }} |
78 | 82 | FLB_OPT: ${{ matrix.flb_option }} |
79 | 83 |
|
80 | 84 | run-macos-unit-tests: |
@@ -128,7 +132,9 @@ jobs: |
128 | 132 | omit_option: "-DFLB_WITHOUT_flb-it-utils=1 -DFLB_WITHOUT_flb-it-pack=1" |
129 | 133 | global_option: "-DFLB_BACKTRACE=Off -DFLB_SHARED_LIB=Off -DFLB_DEBUG=On -DFLB_ALL=On -DFLB_EXAMPLES=Off" |
130 | 134 | unit_test_option: "-DFLB_TESTS_INTERNAL=On" |
131 | | - compiler: gcc |
| 135 | + compiler: |
| 136 | + cc: gcc |
| 137 | + cxx: g++ |
132 | 138 | steps: |
133 | 139 | - name: Checkout Fluent Bit code |
134 | 140 | uses: actions/checkout@v4 |
@@ -163,8 +169,8 @@ jobs: |
163 | 169 | ctest -j $nparallel --build-run-dir . --output-on-failure |
164 | 170 | working-directory: build |
165 | 171 | env: |
166 | | - CC: ${{ matrix.config.compiler }} |
167 | | - CXX: ${{ matrix.config.compiler }} |
| 172 | + CC: ${{ matrix.config.compiler.cc }} |
| 173 | + CXX: ${{ matrix.config.compiler.cxx }} |
168 | 174 |
|
169 | 175 | run-qemu-ubuntu-unit-tests: |
170 | 176 | # We chain this after Linux one as there are CPU time costs for QEMU emulation |
@@ -208,7 +214,7 @@ jobs: |
208 | 214 | export FLB_UNIT_TEST_OPTION="-DFLB_TESTS_INTERNAL=On" |
209 | 215 | export FLB_OPT="${FLB_OPTION} ${GLOBAL_OPTION} ${FLB_UNIT_TEST_OPTION} ${FLB_OMIT_OPTION}" |
210 | 216 | export CC=gcc |
211 | | - export CXX=gcc |
| 217 | + export CXX=g++ |
212 | 218 |
|
213 | 219 | echo "CC = $CC, CXX = $CXX, FLB_OPT = $FLB_OPT" |
214 | 220 |
|
|
0 commit comments