summaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2024-01-29 13:38:54 (GMT)
committerGitHub <noreply@github.com>2024-01-29 13:38:54 (GMT)
commit365e23340cd001ee751da366235ae420156ad728 (patch)
tree49d5a73db00b4eb8ecdd8c872027f58265e18ba4 /.github
parent1bea9e6100fd7c92caf31eba96766aa8ec4f356c (diff)
downloadhdf5-365e23340cd001ee751da366235ae420156ad728.zip
hdf5-365e23340cd001ee751da366235ae420156ad728.tar.gz
hdf5-365e23340cd001ee751da366235ae420156ad728.tar.bz2
Fix doxygen errors (#3962)
* Switch warnings as errors to default OFF * Enable mac docs * Add doxygen action uses step * Use html div around snippet * Allow preset name to be an argument to cmake-ctest.yml
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/cmake-ctest.yml49
-rw-r--r--.github/workflows/daily-build.yml1
-rw-r--r--.github/workflows/main-cmake.yml14
-rw-r--r--.github/workflows/release.yml1
4 files changed, 46 insertions, 19 deletions
diff --git a/.github/workflows/cmake-ctest.yml b/.github/workflows/cmake-ctest.yml
index aa13922..00fb7b4 100644
--- a/.github/workflows/cmake-ctest.yml
+++ b/.github/workflows/cmake-ctest.yml
@@ -8,6 +8,10 @@ on:
description: "The common base name of the source tarballs"
required: true
type: string
+ preset_name:
+ description: "The common base name of the preset configuration name to control the build"
+ required: true
+ type: string
permissions:
contents: read
@@ -24,6 +28,11 @@ jobs:
- name: Install Dependencies (Windows)
run: choco install ninja
+ - name: Install Dependencies
+ uses: ssciwr/doxygen-install@v1
+ with:
+ version: "1.10.0"
+
- name: Enable Developer Command Prompt
uses: ilammy/msvc-dev-cmd@v1.13.0
@@ -59,7 +68,7 @@ jobs:
- name: Run ctest (Windows)
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
- cmake --workflow --preset=ci-StdShar-MSVC --fresh
+ cmake --workflow --preset=${{ inputs.preset_name }}-MSVC --fresh
shell: bash
- name: Publish binary (Windows)
@@ -70,7 +79,7 @@ jobs:
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/COPYING -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/README.md -Destination ${{ runner.workspace }}/build/hdf5/
- Copy-Item -Path ${{ runner.workspace }}/hdf5/build/ci-StdShar-MSVC/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip
+ Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-MSVC/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip
cd "${{ runner.workspace }}/build"
7z a -tzip ${{ steps.set-file-base.outputs.FILE_BASE }}-win-vs2022_cl.zip hdf5
shell: pwsh
@@ -96,7 +105,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install CMake Dependencies (Linux)
- run: sudo apt-get install ninja-build doxygen graphviz
+ run: sudo apt-get install ninja-build graphviz
+
+ - name: Install Dependencies
+ uses: ssciwr/doxygen-install@v1
+ with:
+ version: "1.10.0"
- name: Set file base name (Linux)
id: set-file-base
@@ -122,7 +136,7 @@ jobs:
- name: Run ctest (Linux)
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
- cmake --workflow --preset=ci-StdShar-GNUC --fresh
+ cmake --workflow --preset=${{ inputs.preset_name }}-GNUC --fresh
shell: bash
- name: Publish binary (Linux)
@@ -133,7 +147,7 @@ jobs:
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/README.md ${{ runner.workspace }}/build/hdf5
- cp ${{ runner.workspace }}/hdf5/build/ci-StdShar-GNUC/*.tar.gz ${{ runner.workspace }}/build/hdf5
+ cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC/*.tar.gz ${{ runner.workspace }}/build/hdf5
cd "${{ runner.workspace }}/build"
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc.tar.gz hdf5
shell: bash
@@ -156,7 +170,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: docs-doxygen
- path: ${{ runner.workspace }}/hdf5/build/ci-StdShar-GNUC/hdf5lib_docs/html
+ path: ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC/hdf5lib_docs/html
if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`
build_and_test_mac:
@@ -166,7 +180,12 @@ jobs:
runs-on: macos-11
steps:
- name: Install Dependencies (MacOS)
- run: brew install ninja doxygen
+ run: brew install ninja
+
+ - name: Install Dependencies
+ uses: ssciwr/doxygen-install@v1
+ with:
+ version: "1.10.0"
- name: Set file base name (MacOS)
id: set-file-base
@@ -201,7 +220,7 @@ jobs:
id: run-ctest
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
- cmake --workflow --preset=ci-StdShar-Clang --fresh
+ cmake --workflow --preset=${{ inputs.preset_name }}-Clang --fresh
shell: bash
- name: Publish binary (MacOS)
@@ -212,7 +231,7 @@ jobs:
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/README.md ${{ runner.workspace }}/build/hdf5
- cp ${{ runner.workspace }}/hdf5/build/ci-StdShar-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5
+ cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Clang/*.tar.gz ${{ runner.workspace }}/build/hdf5
cd "${{ runner.workspace }}/build"
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-osx12.tar.gz hdf5
shell: bash
@@ -265,7 +284,7 @@ jobs:
- name: Run ctest (Linux S3)
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
- cmake --workflow --preset=ci-StdShar-GNUC-S3 --fresh
+ cmake --workflow --preset=${{ inputs.preset_name }}-GNUC-S3 --fresh
shell: bash
- name: Publish binary (Linux S3)
@@ -276,7 +295,7 @@ jobs:
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/README.md ${{ runner.workspace }}/build/hdf5
- cp ${{ runner.workspace }}/hdf5/build/ci-StdShar-GNUC-S3/*.tar.gz ${{ runner.workspace }}/build/hdf5
+ cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-GNUC-S3/*.tar.gz ${{ runner.workspace }}/build/hdf5
cd "${{ runner.workspace }}/build"
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2204_gcc_s3.tar.gz hdf5
shell: bash
@@ -350,7 +369,7 @@ jobs:
CXX: ${{ steps.setup-fortran.outputs.cxx }}
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
- cmake --workflow --preset=ci-StdShar-Intel --fresh
+ cmake --workflow --preset=${{ inputs.preset_name }}-Intel --fresh
shell: pwsh
- name: Publish binary (Windows_intel)
@@ -361,7 +380,7 @@ jobs:
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/COPYING -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 -Destination ${{ runner.workspace }}/build/hdf5/
Copy-Item -Path ${{ runner.workspace }}/hdf5/hdfsrc/README.md -Destination ${{ runner.workspace }}/build/hdf5/
- Copy-Item -Path ${{ runner.workspace }}/hdf5/build/ci-StdShar-Intel/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip
+ Copy-Item -Path ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/* -Destination ${{ runner.workspace }}/build/hdf5/ -Include *.zip
cd "${{ runner.workspace }}/build"
7z a -tzip ${{ steps.set-file-base.outputs.FILE_BASE }}-win-vs2022_intel.zip hdf5
shell: pwsh
@@ -424,7 +443,7 @@ jobs:
CXX: ${{ steps.setup-fortran.outputs.cxx }}
run: |
cd "${{ runner.workspace }}/hdf5/hdfsrc"
- cmake --workflow --preset=ci-StdShar-Intel --fresh
+ cmake --workflow --preset=${{ inputs.preset_name }}-Intel --fresh
shell: bash
- name: Publish binary (Linux_intel)
@@ -435,7 +454,7 @@ jobs:
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/COPYING_LBNL_HDF5 ${{ runner.workspace }}/build/hdf5
cp ${{ runner.workspace }}/hdf5/hdfsrc/README.md ${{ runner.workspace }}/build/hdf5
- cp ${{ runner.workspace }}/hdf5/build/ci-StdShar-Intel/*.tar.gz ${{ runner.workspace }}/build/hdf5
+ cp ${{ runner.workspace }}/hdf5/build/${{ inputs.preset_name }}-Intel/*.tar.gz ${{ runner.workspace }}/build/hdf5
cd "${{ runner.workspace }}/build"
tar -zcvf ${{ steps.set-file-base.outputs.FILE_BASE }}-ubuntu-2204_intel.tar.gz hdf5
shell: bash
diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml
index 5633b3c..952b9db 100644
--- a/.github/workflows/daily-build.yml
+++ b/.github/workflows/daily-build.yml
@@ -23,6 +23,7 @@ jobs:
uses: ./.github/workflows/cmake-ctest.yml
with:
file_base: ${{ needs.call-workflow-tarball.outputs.file_base }}
+ preset_name: ci-StdShar
#use_tag: snapshot
#use_environ: snapshots
if: ${{ needs.call-workflow-tarball.outputs.has_changes == 'true' }}
diff --git a/.github/workflows/main-cmake.yml b/.github/workflows/main-cmake.yml
index 7669bd9..3294fb1 100644
--- a/.github/workflows/main-cmake.yml
+++ b/.github/workflows/main-cmake.yml
@@ -52,7 +52,7 @@ jobs:
cpp: ON
fortran: OFF
java: ON
- docs: OFF
+ docs: ON
libaecfc: ON
localaec: OFF
zlibfc: ON
@@ -96,7 +96,7 @@ jobs:
cpp: ON
fortran: OFF
java: ON
- docs: OFF
+ docs: ON
libaecfc: ON
localaec: OFF
zlibfc: ON
@@ -136,7 +136,7 @@ jobs:
- name: Install Linux Dependencies
run: |
sudo apt update
- sudo apt-get install ninja-build doxygen graphviz
+ sudo apt-get install ninja-build graphviz
sudo apt install libssl3 libssl-dev libcurl4 libcurl4-openssl-dev
sudo apt install gcc-12 g++-12 gfortran-12
echo "CC=gcc-12" >> $GITHUB_ENV
@@ -151,9 +151,14 @@ jobs:
if: matrix.os == 'windows-latest'
- name: Install Dependencies (macOS)
- run: brew install ninja doxygen
+ run: brew install ninja
if: matrix.os == 'macos-13'
+ - name: Install Dependencies
+ uses: ssciwr/doxygen-install@v1
+ with:
+ version: "1.9.7"
+
- name: Set environment for MSVC (Windows)
run: |
# Set these environment variables so CMake picks the correct compiler
@@ -179,6 +184,7 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} \
-DBUILD_SHARED_LIBS=ON \
-DHDF5_ENABLE_ALL_WARNINGS=ON \
+ -DHDF5_ENABLE_DOXY_WARNINGS=ON \
-DHDF5_ENABLE_PARALLEL:BOOL=${{ matrix.parallel }} \
-DHDF5_BUILD_CPP_LIB:BOOL=${{ matrix.cpp }} \
-DHDF5_BUILD_FORTRAN=${{ matrix.fortran }} \
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 28f2425..3bf79f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -84,6 +84,7 @@ jobs:
uses: ./.github/workflows/cmake-ctest.yml
with:
file_base: ${{ needs.create-files-ctest.outputs.file_base }}
+ preset_name: ci-StdShar
call-workflow-release:
#needs: [call-workflow-tarball, call-workflow-ctest]