|
36 | 36 | required: false |
37 | 37 | type: string |
38 | 38 | default: "true" |
| 39 | + linux-clang: |
| 40 | + required: false |
| 41 | + type: string |
| 42 | + default: "true" |
39 | 43 | build-release: |
40 | 44 | required: false |
41 | 45 | type: string |
|
73 | 77 | [[ "true" == "${{ inputs.windows }}" ]] && echo '{ "name": "Windows MSVC", "os": "windows-latest", "cc": "cl.exe", "cxx": "cl.exe", "icon": "Windows", "extra-flags": "" }' |
74 | 78 | [[ "true" == "${{ inputs.windows }}" && "true" == "${{inputs.linux}}" ]] && echo ',' |
75 | 79 | [[ "true" == "${{ inputs.linux }}" ]] && echo '{ "name": "Ubuntu gcc", "os": "ubuntu-latest", "cc": "gcc", "cxx": "g++", "icon": "Linux", "extra-flags": "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DRADIUM_ENABLE_GL_TESTING=ON" }' |
76 | | - [[ "true" == "${{ inputs.windows }}" || "true" == "${{inputs.linux}}" ]] && [[ "true" == "${{inputs.macos}}" ]] && echo ',' |
| 80 | + [[ "true" == "${{ inputs.windows }}" || "true" == "${{inputs.linux}}" ]] && [[ "true" == "${{inputs.linux-clang}}" ]] && echo ',' |
| 81 | + [[ "true" == "${{ inputs.linux-clang }}" ]] && echo '{ "name": "Ubuntu clang", "os": "ubuntu-latest", "cc": "clang", "cxx": "clang++", "icon": "Linux", "extra-flags": "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations -DRADIUM_ENABLE_GL_TESTING=ON" }' |
| 82 | + [[ "true" == "${{ inputs.windows }}" || "true" == "${{inputs.linux}}" || "true" == "${{inputs.linux-clang}}" ]] && [[ "true" == "${{inputs.macos}}" ]] && echo ',' |
77 | 83 | [[ "true" == "${{ inputs.macos }}" ]] && echo '{ "name": "MacOS clang", "os": "macos-13", "cc": "clang", "cxx": "clang++", "icon": "Apple", "extra-flags": "-DCMAKE_CXX_FLAGS=-Wno-deprecated-declarations" }' |
78 | 84 | echo '],' |
79 | 85 | echo '"build-type" : [' |
|
87 | 93 | echo '],' |
88 | 94 | echo '"qtversion" : [ { "name" : "qt6", "value" : "6.2.0"}],' |
89 | 95 | echo '"coverage" : [' |
90 | | - [[ "true" == "${{ inputs.coverage }}" ]] && echo '{ "value" : "ON", "extra-flags" : "-DRADIUM_ENABLE_GL_TESTING=ON" }' || echo '{ "value" : "OFF", "extra-flags" : "" }' |
| 96 | + [[ "true" == "${{ inputs.coverage }}" ]] && echo '{ "value" : "ON", "extra-flags" : "" }' || echo '{ "value" : "OFF", "extra-flags" : "" }' |
91 | 97 | echo "]" |
92 | 98 | echo "}" |
93 | 99 | ) | jq -c .) |
@@ -143,8 +149,8 @@ jobs: |
143 | 149 | if: runner.os == 'Linux' |
144 | 150 | run: | |
145 | 151 | sudo apt-get update |
146 | | - sudo apt-get install -y libglfw3-dev libxml2-utils lcov |
147 | | - pip3 install fastcov |
| 152 | + sudo apt-get install -y libglfw3-dev libxml2-utils |
| 153 | + sudo apt-get install -y llvm |
148 | 154 |
|
149 | 155 | - name: Install dep MacOS |
150 | 156 | if: runner.os == 'macOS' |
@@ -219,7 +225,7 @@ jobs: |
219 | 225 | run: | |
220 | 226 | "${{ env.src_prefix }}/Radium-Engine/scripts/build.sh" -e true -r false \ |
221 | 227 | -B "${{ env.build_prefix }}" -c ${{ matrix.build-type }} \ |
222 | | - -G Ninja --cc ${{ matrix.config.cc }} --cxx ${{ matrix.config.cxx }} \ |
| 228 | + -G Ninja --cc "${{ matrix.config.cc }}" --cxx "${{ matrix.config.cxx }}" \ |
223 | 229 | --install-external "${{ steps.paths.outputs.external_install_dir }}" |
224 | 230 |
|
225 | 231 | - name: Configure and build Radium |
@@ -275,27 +281,15 @@ jobs: |
275 | 281 | - name: Create coverage report |
276 | 282 | if: ${{ inputs.coverage == 'true' }} |
277 | 283 | run: | |
278 | | - cmake --build "${{ steps.paths.outputs.radium_build_dir }}" --config Debug --target fastcov_integration |
279 | | - cmake --build "${{ steps.paths.outputs.radium_build_dir }}" --config Debug --target fastcov_unittests |
| 284 | + cmake --build "${{ steps.paths.outputs.radium_build_dir }}" --config Release --target coverage |
280 | 285 |
|
281 | 286 | - name: Upload unittests coverage report |
282 | 287 | if: ${{ inputs.coverage == 'true' }} |
283 | 288 | uses: codecov/codecov-action@v5 |
284 | 289 | with: |
285 | | - fail_ci_if_error: true # optional (default = false) |
286 | | - files: ${{ steps.paths.outputs.radium_build_dir }}/fastcov_unittests.info |
287 | | - flags: unittests |
288 | | - token: ${{ secrets.CODECOV_TOKEN }} |
289 | | - verbose: true # optional (default = false) |
290 | | - disable_search: true |
291 | | - |
292 | | - - name: Upload integration coverage report |
293 | | - if: ${{ inputs.coverage == 'true' }} |
294 | | - uses: codecov/codecov-action@v5 |
295 | | - with: |
296 | | - fail_ci_if_error: true # optional (default = false) |
297 | | - files: ${{ steps.paths.outputs.radium_build_dir }}/fastcov_integration.info |
298 | | - flags: integration |
| 290 | + # fail_ci_if_error: true # optional (default = false) |
| 291 | + directory: ${{ steps.paths.outputs.radium_build_dir }} |
| 292 | + files: ${{ steps.paths.outputs.radium_build_dir }}/coverage.txt |
299 | 293 | token: ${{ secrets.CODECOV_TOKEN }} |
300 | 294 | verbose: true # optional (default = false) |
301 | | - disable_search: true |
| 295 | + # disable_search: true |
0 commit comments