|
36 | 36 | check-on-linux:
|
37 | 37 | runs-on: ubuntu-24.04
|
38 | 38 | needs: [pre-commit]
|
39 |
| - timeout-minutes: 15 |
| 39 | + |
40 | 40 | strategy:
|
41 |
| - fail-fast: false |
42 | 41 | matrix:
|
43 | 42 | triplet: [x64-linux]
|
44 | 43 | compiler: [gcc-13, llvm-17]
|
@@ -115,9 +114,12 @@ jobs:
|
115 | 114 | if: false
|
116 | 115 | runs-on: macos-14
|
117 | 116 | needs: [pre-commit]
|
| 117 | +<<<<<<< before updating |
118 | 118 | timeout-minutes: 30
|
| 119 | +======= |
| 120 | + |
| 121 | +>>>>>>> after updating |
119 | 122 | strategy:
|
120 |
| - fail-fast: false |
121 | 123 | matrix:
|
122 | 124 | triplet: [arm64-osx]
|
123 | 125 | compiler: [gcc@13, llvm@17]
|
@@ -201,9 +203,8 @@ jobs:
|
201 | 203 | check-on-windows:
|
202 | 204 | runs-on: windows-2022
|
203 | 205 | needs: [pre-commit]
|
204 |
| - timeout-minutes: 15 |
| 206 | + |
205 | 207 | strategy:
|
206 |
| - fail-fast: false |
207 | 208 | matrix:
|
208 | 209 | triplet: [x64-windows]
|
209 | 210 | compiler: [msvc-2022, llvm-17]
|
@@ -267,9 +268,8 @@ jobs:
|
267 | 268 | check-mingw:
|
268 | 269 | runs-on: windows-2022
|
269 | 270 | needs: [pre-commit]
|
270 |
| - timeout-minutes: 15 |
| 271 | + |
271 | 272 | strategy:
|
272 |
| - fail-fast: false |
273 | 273 | matrix:
|
274 | 274 | triplet: [x64-mingw-dynamic]
|
275 | 275 | compiler: [mingw]
|
@@ -307,7 +307,7 @@ jobs:
|
307 | 307 |
|
308 | 308 | - name: Prepare for gcovr
|
309 | 309 | run: |
|
310 |
| - pip install gcovr==7.2 |
| 310 | + pip install gcovr==8.2 |
311 | 311 |
|
312 | 312 | - name: Configure CMake
|
313 | 313 | run: >
|
@@ -337,9 +337,8 @@ jobs:
|
337 | 337 | check-sanitizers:
|
338 | 338 | runs-on: ubuntu-24.04
|
339 | 339 | needs: [pre-commit]
|
340 |
| - timeout-minutes: 15 |
| 340 | + |
341 | 341 | strategy:
|
342 |
| - fail-fast: false |
343 | 342 | matrix:
|
344 | 343 | sanitizer:
|
345 | 344 | - address,undefined
|
@@ -387,9 +386,8 @@ jobs:
|
387 | 386 | check-valgrind:
|
388 | 387 | runs-on: ubuntu-24.04
|
389 | 388 | needs: [pre-commit]
|
390 |
| - timeout-minutes: 15 |
| 389 | + |
391 | 390 | strategy:
|
392 |
| - fail-fast: false |
393 | 391 | matrix:
|
394 | 392 | build_type: [Debug, RelWithDebInfo]
|
395 | 393 |
|
@@ -455,7 +453,6 @@ jobs:
|
455 | 453 | clang-tidy:
|
456 | 454 | runs-on: ubuntu-24.04
|
457 | 455 | needs: [pre-commit]
|
458 |
| - timeout-minutes: 15 |
459 | 456 |
|
460 | 457 | steps:
|
461 | 458 | - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
@@ -504,7 +501,6 @@ jobs:
|
504 | 501 | cppcheck:
|
505 | 502 | runs-on: ubuntu-24.04
|
506 | 503 | needs: [pre-commit]
|
507 |
| - timeout-minutes: 15 |
508 | 504 |
|
509 | 505 | steps:
|
510 | 506 | - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
@@ -553,7 +549,6 @@ jobs:
|
553 | 549 | check-docs:
|
554 | 550 | runs-on: ubuntu-24.04
|
555 | 551 | needs: [pre-commit]
|
556 |
| - timeout-minutes: 15 |
557 | 552 |
|
558 | 553 | steps:
|
559 | 554 | - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
@@ -599,7 +594,6 @@ jobs:
|
599 | 594 | codecov:
|
600 | 595 | runs-on: ubuntu-24.04
|
601 | 596 | needs: [pre-commit]
|
602 |
| - timeout-minutes: 15 |
603 | 597 |
|
604 | 598 | steps:
|
605 | 599 | - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
@@ -646,12 +640,16 @@ jobs:
|
646 | 640 | run: cmake --build --preset=default --target ccov-all
|
647 | 641 |
|
648 | 642 | - name: Upload coverage report
|
| 643 | +<<<<<<< before updating |
649 | 644 | uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
|
| 645 | +======= |
| 646 | + uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1 |
| 647 | +>>>>>>> after updating |
650 | 648 | with:
|
651 | 649 | token: ${{ secrets.CODECOV_TOKEN }}
|
652 | 650 | fail_ci_if_error: true
|
653 | 651 | disable_search: true
|
654 |
| - file: ./out/build/default/code_coverage/coverage.info |
| 652 | + files: ./out/build/default/code_coverage/coverage.info |
655 | 653 | verbose: true
|
656 | 654 |
|
657 | 655 |
|
|
0 commit comments