From dda359117a493f519da3f22fe5902ccf06bbd713 Mon Sep 17 00:00:00 2001 From: scivision Date: Thu, 18 Jan 2024 13:36:51 -0500 Subject: [PATCH] ci: add gcc 13 --- .github/workflows/ci.yml | 13 +++++++------ .github/workflows/oneapi-linux.yml | 1 + CMakeLists.txt | 4 ++-- README.md | 1 + 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ea0635..3aff011 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,7 @@ name: ci env: HOMEBREW_NO_INSTALL_CLEANUP: 1 CTEST_NO_TESTS_ACTION: error + CTEST_PARALLEL_LEVEL: 4 on: push: @@ -27,17 +28,17 @@ jobs: matrix: os: [ubuntu-latest] shared: [false] - gcc: [9, 10, 11, 12] + gcc: [9, 10, 11, 12, 13] include: - os: ubuntu-latest shared: true - gcc: 12 + gcc: 13 - os: macos-latest shared: true - gcc: 12 + gcc: 13 - os: macos-latest shared: false - gcc: 12 + gcc: 13 runs-on: ${{ matrix.os }} env: @@ -48,7 +49,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - name: Python pkgs run: pip install numpy h5py @@ -135,7 +136,7 @@ jobs: - name: Code coverage run: cmake --build --parallel --preset run-coverage - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: coverage-report-html path: build-coverage/coverage/ diff --git a/.github/workflows/oneapi-linux.yml b/.github/workflows/oneapi-linux.yml index b9c7b3e..725133a 100644 --- a/.github/workflows/oneapi-linux.yml +++ b/.github/workflows/oneapi-linux.yml @@ -6,6 +6,7 @@ env: FC: ifx # https://github.com/oneapi-src/oneapi-ci/blob/master/.github/workflows/build_all.yml CTEST_NO_TESTS_ACTION: error + CTEST_PARALLEL_LEVEL: 4 CMAKE_BUILD_PARALLEL_LEVEL: 4 CMAKE_BUILD_TYPE: Release # debug triggers asan build errors, peculiar to GitHub Actions diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a94352..3aedd04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,11 +60,11 @@ target_link_libraries(h5fortran PUBLIC HDF5::HDF5) set_property(TARGET h5fortran PROPERTY Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include) set_property(TARGET h5fortran PROPERTY VERSION ${PROJECT_VERSION}) -# GLOBAL needed for use by FetchContent +# GLOBAL needed for use by parent projects add_library(h5fortran::h5fortran INTERFACE IMPORTED GLOBAL) target_link_libraries(h5fortran::h5fortran INTERFACE h5fortran) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include) -# avoid race condition when used by FetchContent +# avoid race condition when used by parent projects install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/h5fortran.mod DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/README.md b/README.md index 651da8a..ef814dd 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![ci](https://github.com/geospace-code/h5fortran/actions/workflows/ci.yml/badge.svg)](https://github.com/geospace-code/h5fortran/actions/workflows/ci.yml) [![ci_build](https://github.com/geospace-code/h5fortran/actions/workflows/ci_build.yml/badge.svg)](https://github.com/geospace-code/h5fortran/actions/workflows/ci_build.yml) +[![oneapi-linux](https://github.com/geospace-code/h5fortran/actions/workflows/oneapi-linux.yml/badge.svg)](https://github.com/geospace-code/h5fortran/actions/workflows/oneapi-linux.yml) [![ci_fpm](https://github.com/geospace-code/h5fortran/actions/workflows/ci_fpm.yml/badge.svg)](https://github.com/geospace-code/h5fortran/actions/workflows/ci_fpm.yml) Simple, robust, thin HDF5 polymorphic Fortran read/write interface.