Skip to content

Commit 3658de8

Browse files
committed
Updates
1 parent 403b743 commit 3658de8

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

.github/workflows/pr.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,9 @@ jobs:
3737
steps:
3838
- name: Checkout repo
3939
uses: actions/checkout@v3
40-
- name: Install and Check Doxygen
40+
- name: Run Doxygen Check with CI Script
4141
run: |
42-
conda init bash
43-
source /usr/share/miniconda/etc/profile.d/conda.sh
44-
conda create -n doxygen_env -c conda-forge doxygen=1.9.1 -y
45-
conda activate doxygen_env
46-
doxygen --version
47-
./ci/pre-commit/doxygen.sh
48-
if [ $? -ne 0 ]; then
49-
echo "Doxygen check failed"
50-
exit 1
51-
fi
42+
./ci/doxygen_check.sh
5243
shell: bash -euxo pipefail {0}
5344

5445
compute-matrix:

ci/pre-commit/doxygen.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# skip if doxygen is not installed
17+
# Skip if doxygen is not installed
1818
if ! [ -x "$(command -v doxygen)" ]; then
19-
echo -e "warning: Doxygen is not installed"
19+
echo -e "Warning: Doxygen is not installed - skipping check"
2020
exit 0
2121
fi
2222

@@ -26,11 +26,13 @@ function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4
2626
# Doxygen supported version 1.8.20 to 1.9.1
2727
DOXYGEN_VERSION=$(doxygen --version)
2828
if [ $(version "$DOXYGEN_VERSION") -lt $(version "1.8.20") ] || [ $(version $DOXYGEN_VERSION) -gt $(version "1.9.1") ]; then
29-
echo -e "Warning: Unsupported Doxygen version $DOXYGEN_VERSION"
30-
echo -e "Expecting Doxygen version from 1.8.20 to 1.9.1"
29+
echo -e "Warning: Unsupported Doxygen version $DOXYGEN_VERSION - skipping check"
30+
echo -e "Expected Doxygen version from 1.8.20 to 1.9.1"
3131
exit 0
3232
fi
3333

34+
echo "Using doxygen version: ${DOXYGEN_VERSION}"
35+
3436
# Run doxygen, ignore missing tag files error
3537
TAG_ERROR1="error: Tag file '.*.tag' does not exist or is not a file. Skipping it..."
3638
TAG_ERROR2="error: cannot open tag file .*.tag for writing"

0 commit comments

Comments
 (0)