Skip to content

Commit 17a57c0

Browse files
committed
Add manual doxygen install option
Signed-off-by: Michael Dolan <[email protected]>
1 parent e57733f commit 17a57c0

File tree

10 files changed

+44
-30
lines changed

10 files changed

+44
-30
lines changed

.github/workflows/analysis_workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ jobs:
4747
- name: Install sonar-scanner and build-wrapper
4848
uses: sonarsource/sonarcloud-github-c-cpp@v2
4949
- name: Install docs env
50-
run: share/ci/scripts/linux/yum/install_docs_env.sh
50+
run: share/ci/scripts/linux/dnf/install_docs_env.sh
5151
- name: Install tests env
52-
run: share/ci/scripts/linux/yum/install_tests_env.sh
52+
run: share/ci/scripts/linux/dnf/install_tests_env.sh
5353
- name: Create build directories
5454
run: |
5555
mkdir _install

.github/workflows/ci_workflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,10 @@ jobs:
154154
- name: Checkout
155155
uses: actions/checkout@v4
156156
- name: Install docs env
157-
run: share/ci/scripts/linux/yum/install_docs_env.sh
157+
run: share/ci/scripts/linux/dnf/install_docs_env.sh
158158
if: matrix.build-docs == 'ON'
159159
- name: Install tests env
160-
run: share/ci/scripts/linux/yum/install_tests_env.sh
160+
run: share/ci/scripts/linux/dnf/install_tests_env.sh
161161
- name: Create build directories
162162
run: |
163163
mkdir _install
@@ -366,10 +366,10 @@ jobs:
366366
- name: Checkout
367367
uses: actions/checkout@v3
368368
- name: Install docs env
369-
run: share/ci/scripts/linux/yum/install_docs_env.sh
369+
run: share/ci/scripts/linux/dnf/install_docs_env.sh
370370
if: matrix.build-docs == 'ON'
371371
- name: Install tests env
372-
run: share/ci/scripts/linux/yum/install_tests_env.sh
372+
run: share/ci/scripts/linux/dnf/install_tests_env.sh
373373
- name: Create build directories
374374
run: |
375375
mkdir _install

.github/workflows/dependencies_latest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ jobs:
9292
- name: Checkout
9393
uses: actions/checkout@v3
9494
- name: Install docs env
95-
run: share/ci/scripts/linux/yum/install_docs_env.sh
95+
run: share/ci/scripts/linux/dnf/install_docs_env.sh
9696
if: matrix.build-docs == 'ON'
9797
- name: Install tests env
98-
run: share/ci/scripts/linux/yum/install_tests_env.sh
98+
run: share/ci/scripts/linux/dnf/install_tests_env.sh
9999
- name: Setup ext environment
100100
run: |
101101
EXT_PATH=/usr/local

.github/workflows/platform_latest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Checkout
8989
uses: actions/checkout@v4
9090
- name: Install tests env
91-
run: share/ci/scripts/linux/yum/install_tests_env.sh
91+
run: share/ci/scripts/linux/dnf/install_tests_env.sh
9292
- name: Create build directories
9393
run: |
9494
mkdir _install

docs/guides/contributing/documentation_guidelines.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ will install the Python-related requirements for building the documentation
2828
and breathe) and Doxygen.
2929

3030
**Note:** If you are on Linux using yum and don't already have Doxygen installed, you will have to
31-
uncomment the relevant line in ``share/ci/scripts/linux/yum/install_docs_env.sh``
31+
uncomment the relevant line in ``share/ci/scripts/linux/dnf/install_docs_env.sh``
3232

3333
Use GitBash (`provided with Git for Windows <https://gitforwindows.org/>`_) to
3434
execute the script on Windows.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test-command = [
2727
]
2828

2929
[tool.cibuildwheel.linux]
30-
before-build = "share/ci/scripts/linux/yum/install_docs_env.sh"
30+
before-build = "share/ci/scripts/linux/dnf/install_docs_env.sh"
3131

3232
[tool.cibuildwheel.macos]
3333
# cibuildwheel in some cases set this to 10.9 by default, OCIO needs >= 10.13
File renamed without changes.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#!/usr/bin/env bash
2+
# SPDX-License-Identifier: BSD-3-Clause
3+
# Copyright Contributors to the OpenColorIO Project.
4+
5+
set -ex
6+
7+
DOXYGEN_VERSION="$1"
8+
9+
if command -v dnf >/dev/null; then
10+
if [ "$DOXYGEN_VERSION" == "latest" ]; then
11+
dnf install -y doxygen
12+
else
13+
dnf install -y doxygen-${DOXYGEN_VERSION}
14+
fi
15+
else
16+
# Is some version of doxygen already available?
17+
if command -v doxygen >/dev/null; then
18+
if [ "$DOXYGEN_VERSION" == "latest" ]; then
19+
# Get latest doxygen version from GH
20+
DOXYGEN_VERSION=$(
21+
curl --silent https://api.github.com/repos/doxygen/doxygen/releases/latest | \
22+
grep '"tag_name":' | \
23+
sed -E 's/.*"Release_([0-9_]+)".*/\1/' | \
24+
tr '_' '.'
25+
)
26+
fi
27+
28+
# Manual install
29+
wget https://doxygen.nl/files/doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
30+
tar -xzf doxygen-${DOXYGEN_VERSION}.linux.bin.tar.gz
31+
cp doxygen-${DOXYGEN_VERSION}/bin/doxygen /usr/local/bin/
32+
fi
33+
fi
File renamed without changes.

share/ci/scripts/linux/yum/install_doxygen.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)