Skip to content

Commit

Permalink
CI: Upgrade to Ubuntu 24.04 image
Browse files Browse the repository at this point in the history
  • Loading branch information
stotko committed Nov 16, 2024
1 parent 5f88fb8 commit cda0c27
Show file tree
Hide file tree
Showing 10 changed files with 600 additions and 86 deletions.
7 changes: 7 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
parsers:
gcov:
branch_detection:
conditional: no
loop: no
method: no
macro: no
14 changes: 7 additions & 7 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:
jobs:
compute:
name: "Compute"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand All @@ -25,10 +25,10 @@ jobs:
run: |
bash tools/ubuntu/install_openmp.sh
- name: Install lcov
- name: Install gcovr
shell: bash
run: |
bash tools/ubuntu/install_lcov.sh
bash tools/ubuntu/install_gcovr.sh
- name: Download dependencies
shell: bash
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Configure project
shell: bash
run: |
bash tools/backend/configure_openmp_lcov.sh
bash tools/backend/configure_openmp_coverage.sh
- name: Build project
shell: bash
Expand All @@ -57,7 +57,7 @@ jobs:

publish:
name: Upload coverage report to Codecov
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

needs:
- compute
Expand All @@ -74,7 +74,7 @@ jobs:
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: build/stdgpu_coverage.info
files: build/stdgpu_coverage.xml
fail_ci_if_error: true
verbose: true
disable_search: true
Expand All @@ -87,7 +87,7 @@ jobs:
- publish

name: "Check Coverage"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: re-actors/alls-green@release/v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:
jobs:
build:
name: Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:

publish:
name: Upload latest docs to GitHub Pages
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.event_name != 'pull_request'

needs:
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- publish

name: "Check Docs"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: re-actors/alls-green@release/v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
clangtidy:
name: "Clang-Tidy"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
cppcheck:
name: "Cppcheck"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- cppcheck

name: "Check Lint"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: re-actors/alls-green@release/v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
ubuntu:
strategy:
matrix:
os: ['ubuntu-20.04', 'ubuntu-22.04']
os: ['ubuntu-22.04', 'ubuntu-24.04']
build_type: [Debug, Release]
shared_libs: [ON, OFF]
use_32bit_index: [ON, OFF]
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
- windows

name: "Check Tests"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: re-actors/alls-green@release/v1
Expand Down
11 changes: 7 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@ endif()
if(STDGPU_BUILD_TESTS AND STDGPU_BUILD_TEST_COVERAGE)
include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/code_coverage.cmake")
append_coverage_compiler_flags()
set(COVERAGE_EXCLUDES '*CMake*' '*build/*' '*benchmarks/*' '*examples/*' '*external/*' '*tests/*' '/usr/*')
# Disable optimization for accurate reports
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0")
endif()


Expand Down Expand Up @@ -199,9 +201,10 @@ if(STDGPU_BUILD_TESTS)
add_subdirectory(tests)

if(STDGPU_BUILD_TEST_COVERAGE)
setup_target_for_coverage(NAME stdgpu_coverage
EXECUTABLE ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} sh tools/run_tests.sh ${CMAKE_BUILD_TYPE}
DEPENDENCIES teststdgpu)
setup_target_for_coverage_gcovr_xml(NAME stdgpu_coverage
EXECUTABLE ${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} sh tools/run_tests.sh ${CMAKE_BUILD_TYPE}
DEPENDENCIES teststdgpu
EXCLUDE "build" "benchmarks" "examples" "external" "tests")
endif()

endif()
Expand Down
Loading

0 comments on commit cda0c27

Please sign in to comment.