Skip to content

Commit b5bf362

Browse files
Merge pull request #7527 from thomasspriggs/tas/doxygen_versions
Align Doxygen versions used for website publishing and PR checks
2 parents eb883a6 + 646101f commit b5bf362

File tree

5 files changed

+313
-114
lines changed

5 files changed

+313
-114
lines changed

.github/workflows/doxygen-check.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ on:
66
jobs:
77
# This job takes approximately 2 minutes
88
check-doxygen:
9-
runs-on: ubuntu-20.04
9+
# Note that the versions used for this `check-doxygen` job should be kept in
10+
# sync with the `publish` job.
11+
runs-on: ubuntu-22.04
1012
steps:
1113
- uses: actions/checkout@v3
1214
- name: Fetch dependencies

.github/workflows/publish.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ on: [push, pull_request]
44
jobs:
55
# This job takes approximately 3 minutes
66
publish:
7-
runs-on: ubuntu-latest
7+
# Note that the versions used for this `publish` job should be kept in sync
8+
# with the `check-doxygen` job.
9+
runs-on: ubuntu-22.04
810
steps:
911
- name: Checkout repository
1012
uses: actions/checkout@v3

scripts/run_doxygen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
echo "Running doxygen version $(doxygen --version)"
44

55
# Check doxygen version
6-
EXPECTED_VERSION="1.8.17"
6+
EXPECTED_VERSION="1.9.1"
77
doxygen --version | grep ^$EXPECTED_VERSION > /dev/null
88
if [ $? -ne 0 ]
99
then

src/analyses/ai.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ Author: Daniel Kroening, [email protected]
6767
/// Users of abstract interpreters should use the interface given by this class.
6868
/// It breaks into three categories:
6969
///
70-
/// 1. Running an analysis, via
71-
/// \ref ai_baset#operator()(const irep_idt&,const goto_programt&, <!--
72-
/// --> const namespacet&),
70+
/// 1. Running an analysis, via \ref
71+
/// #operator()(const irep_idt&,const goto_programt&, const namespacet&),
7372
/// \ref ai_baset#operator()(const goto_functionst&,const namespacet&)
7473
/// and \ref ai_baset#operator()(const abstract_goto_modelt&)
7574
/// 2. Accessing the results of an analysis, by looking up the history objects

0 commit comments

Comments
 (0)