Skip to content

Commit 1cd4679

Browse files
edalmsderonne
authored andcommitted
ci: Restructure dependencies in doc jobs
1 parent 6ab808c commit 1cd4679

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

utils/tests/gitlab-ci-doc.yml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
before_script:
77
- pacman-key --init
88
- pacman -Syu --noconfirm
9-
base-devel ninja cmake python ccache gsl gtk3 boost openmpi openssh libxml2-legacy
10-
graphviz imagemagick texlive-basic texlive-bin texlive-binextra texlive-latexextra
11-
texlive-fontutils texlive-fontsrecommended texlive-mathscience python-sphinx
12-
- pacman --noconfirm -U https://archive.archlinux.org/packages/d/doxygen/doxygen-1.15.0-1-x86_64.pkg.tar.zst
9+
python python-sphinx make libxml2-legacy
10+
graphviz imagemagick
11+
texlive-basic texlive-bin texlive-binextra texlive-latexextra texlive-fontutils texlive-fontsrecommended texlive-mathscience
1312
# dia is archived
14-
- pacman --noconfirm -U https://archive.archlinux.org/packages/g/gtk2/gtk2-2.24.33-5-x86_64.pkg.tar.zst
15-
- pacman --noconfirm -U https://archive.archlinux.org/packages/d/dia/dia-0.97.3-9-x86_64.pkg.tar.zst
16-
# dia requires libxml2-legacy
17-
- pacman --noconfirm -U https://archive.archlinux.org/packages/l/libxml2-legacy/libxml2-legacy-2.13.8-1-x86_64.pkg.tar.zst
13+
- pacman --noconfirm -U
14+
https://archive.archlinux.org/packages/g/gtk2/gtk2-2.24.33-5-x86_64.pkg.tar.zst
15+
https://archive.archlinux.org/packages/d/dia/dia-0.97.3-9-x86_64.pkg.tar.zst
1816
# no policy is a good policy.
1917
- mv /etc/ImageMagick-7/policy.xml /etc/ImageMagick-7/policy.xml.bak
2018
# - sed -i "s/EPS,PDF,//g" /etc/ImageMagick-7/policy.xml
@@ -30,10 +28,16 @@
3028
doxygen-1.15:
3129
extends: .doc
3230
script:
31+
# Install Doxygen and dependencies to build ns-3
32+
- pacman -Syu --noconfirm
33+
base-devel ninja cmake python ccache gsl gtk3 boost openmpi openssh
34+
- pacman --noconfirm -U https://archive.archlinux.org/packages/d/doxygen/doxygen-1.15.0-1-x86_64.pkg.tar.zst
35+
36+
# Build ns-3.
37+
# Debug build is the fastest, and we do not need to actually execute anything, just the examples for introspection.
3338
- mkdir -p $CCACHE_BASEDIR_VALUE
3439
- export CCACHE_BASEDIR=${PWD}
3540
- export CCACHE_DIR=${PWD}/$CCACHE_BASEDIR_VALUE
36-
# debug build is the fastest, and we do not need to actually execute anything, just the examples for introspection.
3741
- export MPI_CI=1
3842
- CXX=$COMPILER ./ns3 configure -d debug -GNinja --enable-examples --enable-tests --enable-asserts --enable-mpi
3943
- ./ns3 build

0 commit comments

Comments
 (0)