diff --git a/utils/tests/gitlab-ci-doc.yml b/utils/tests/gitlab-ci-doc.yml index c30567da0..d16eaee38 100644 --- a/utils/tests/gitlab-ci-doc.yml +++ b/utils/tests/gitlab-ci-doc.yml @@ -26,16 +26,13 @@ doxygen: - CXX=$COMPILER ./ns3 configure --enable-examples --enable-tests --enable-asserts -d release - ./ns3 build # - mkdir -p public/doxygen - - git remote add ns-3-origin https://gitlab.com/nsnam/ns-3-dev.git || true - - git fetch ns-3-origin -# - doc/doxygen.warnings.report.sh -f "$(git diff --name-only ns-3-origin/master --diff-filter=d | tr '\n' ' ' | sed 's/ $//g;s/ /\\\|/g')" - - export CHANGED_FILES=$(git diff --name-only ns-3-origin/master --diff-filter=d | tr '\n' ' ' | sed 's/ $//g;s/ /\\\|/g') - - doc/doxygen.warnings.report.sh -f "$CHANGED_FILES" -# - doc/doxygen.warnings.report.sh -f "$CHANGED_FILES" || EXIT_CODE=$? -# - if [ -z $EXIT_CODE ]; then export EXIT_CODE=0; fi; -# - if [ $EXIT_CODE -ne 0 ]; then if [ -z $CHANGED_FILES ]; then exit 0; fi; fi; -# - exit $EXIT_CODE - +# The following four lines were needed when ns-3 had warnings, and +# it was necessary to have a filter to check only the files tocuhed by a MR. +# - git remote add ns-3-origin https://gitlab.com/nsnam/ns-3-dev.git || true +# - git fetch ns-3-origin +# - export CHANGED_FILES=$(git diff --name-only ns-3-origin/master --diff-filter=d | tr '\n' ' ' | sed 's/ $//g;s/ /\\\|/g') +# - doc/doxygen.warnings.report.sh -f "$CHANGED_FILES" + - doc/doxygen.warnings.report.sh # - doxygen doc/doxygen.conf # - mv doc/html/ public/doxygen cache: