Skip to content

Commit c6c680e

Browse files
committed
Handle dnf/yum/apt for different workflows
Signed-off-by: Michael Dolan <[email protected]>
1 parent 83a45b0 commit c6c680e

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
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/apt/install_docs_env.sh
50+
run: share/ci/scripts/linux/yum/install_docs_env.sh
5151
- name: Install tests env
52-
run: share/ci/scripts/linux/apt/install_tests_env.sh
52+
run: share/ci/scripts/linux/yum/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/apt/install_docs_env.sh
157+
run: share/ci/scripts/linux/yum/install_docs_env.sh
158158
if: matrix.build-docs == 'ON'
159159
- name: Install tests env
160-
run: share/ci/scripts/linux/apt/install_tests_env.sh
160+
run: share/ci/scripts/linux/yum/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/apt/install_docs_env.sh
369+
run: share/ci/scripts/linux/yum/install_docs_env.sh
370370
if: matrix.build-docs == 'ON'
371371
- name: Install tests env
372-
run: share/ci/scripts/linux/apt/install_tests_env.sh
372+
run: share/ci/scripts/linux/yum/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/apt/install_docs_env.sh
95+
run: share/ci/scripts/linux/yum/install_docs_env.sh
9696
if: matrix.build-docs == 'ON'
9797
- name: Install tests env
98-
run: share/ci/scripts/linux/apt/install_tests_env.sh
98+
run: share/ci/scripts/linux/yum/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/apt/install_tests_env.sh
91+
run: share/ci/scripts/linux/yum/install_tests_env.sh
9292
- name: Create build directories
9393
run: |
9494
mkdir _install

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@
55
set -ex
66

77
DOXYGEN_VERSION="$1"
8+
YUM_CMD="yum"
89

10+
# RockyLinux instead of CentOS?
11+
if command -v dnf >/dev/null; then
12+
YUM_CMD="dnf"
13+
fi
14+
15+
$YUM_CMD install -y epel-release
916
if [ "$DOXYGEN_VERSION" == "latest" ]; then
10-
yum install -y doxygen
17+
$YUM_CMD install -y doxygen
1118
else
12-
yum install -y doxygen-${DOXYGEN_VERSION}
19+
$YUM_CMD install -y doxygen-${DOXYGEN_VERSION}
1320
fi

0 commit comments

Comments
 (0)