Skip to content

Commit 5ea4490

Browse files
committed
Merge branch 'feature/Move-gnatfuzz-part-of-documentation' into 'master'
Insert the GNATfuzz documentation earlier Closes eng/das/fuzz/gnatfuzz#663 See merge request eng/das/cov/gnatcoverage!360 This means it appears before the appendix, and before the section about integrating GNATtest with GNATfuzz. Also adds a job to automatically build the docs during CI, when anything in docs/ is changed. Fixes eng/das/fuzz/gnatfuzz#663
2 parents 9c0b5dd + 5f8f76f commit 5ea4490

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed

.gitlab-ci.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,28 @@ build:
6868
paths:
6969
- $PACKAGE_BASE_NAME
7070

71+
build_docs:
72+
stage: build
73+
services:
74+
- image:e3
75+
rules:
76+
- if: $CI_PIPELINE_SOURCE == "merge_request_event" || ($CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH)
77+
changes:
78+
- doc/**/*
79+
when: always
80+
script:
81+
- unset GITLAB_TOKEN
82+
- generic_anod_ci
83+
- . /tmp/ci_env.sh
84+
- anod build gnatdas-doc --latest
85+
- mv $ANOD_DEFAULT_SANDBOX_DIR/x86_64-linux/gnatdas-doc/install/share/doc/gnatdas/ $CI_PROJECT_DIR
86+
artifacts:
87+
when:
88+
always
89+
paths:
90+
- gnatdas/pdf/gnatdas.pdf
91+
- gnatdas/html
92+
7193
build_community:
7294
interruptible: true
7395
services:

doc/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ prepare-installdir.%:
4141
# expect to have a line like << master_doc = "bla" or 'bla' >> someplace.
4242

4343
MASTER_DOC=$(shell sed -n -e \
44-
"s/master_doc.*=[^'\"]*['\"]\([^'\"]*\).*/\1/p" conf.py)
44+
"s/master_doc.*=[^'\"]*['\"]\([^'\"]*\).*/\1/p" conf.py)
4545

4646
# Make sure the PDF we install has a meaningful name and leave the html
4747
# alone so internal hyperlinks to the toplevel page remain functional.
@@ -107,9 +107,9 @@ prepare-builddir.%: $(PREPARE_IMAGES)
107107
# bits to find it in index.rst.
108108
look_for_gnatfuzz:
109109
if [ -e "gnatfuzz/gnatfuzz_part.rst" ]; then \
110-
if [ "`grep "gnatfuzz" index.rst`" = "" ]; then \
111-
echo " gnatfuzz/gnatfuzz_part" >> index.rst; \
112-
fi; \
110+
if [ "`grep "gnatfuzz" index.rst`" = "" ]; then \
111+
sed -i -e 's/\.\. Optional GNATfuzz part/ gnatfuzz\/gnatfuzz_part/g' index.rst; \
112+
fi; \
113113
fi
114114

115115
build.pdf: look_for_gnatfuzz prepare-builddir.pdf

doc/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
gnatcov/gnatcov_part
1010
gnattest/gnattest_part
11+
12+
.. Optional GNATfuzz part
13+
1114
integration/integration_part
1215
1316
.. Appendix part - manual numbering

0 commit comments

Comments
 (0)