Remove "flat" subdirectory, the templates support that in-line now

Author: sdarwin

scripts/lcov-jenkins-gcc-13.sh

@@ -173,10 +173,6 @@ if [ ! "$skipgcovroption" = "yes" ]; then
         rm -r gcovr
     fi
     mkdir gcovr
-    if [ -d "gcovr-flat" ]; then
-        rm -r gcovr-flat
-    fi
-    mkdir gcovr-flat
     cd ../boost-root
     if [ ! -d ci-automation ]; then
         git clone -b master https://github.com/cppalliance/ci-automation
@@ -187,7 +183,6 @@ if [ ! "$skipgcovroption" = "yes" ]; then
     fi
 
     outputlocation="$BOOST_CI_SRC_FOLDER/gcovr"
-    outputlocation_flat="$BOOST_CI_SRC_FOLDER/gcovr-flat"
 
     # First pass, output json
     gcovr "${GCOVR_EXTRA_OPTIONS[@]}" --merge-mode-functions separate --sort uncovered-percent --html-title "$REPONAME" --merge-lines --exclude-unreachable-branches --exclude-throw-branches --exclude '.*/test/.*' --exclude '.*/extra/.*' --exclude '.*/example/.*'  --exclude '.*/examples/.*' --filter "$GCOVRFILTER" --html --output "${outputlocation}/index.html" --json-summary-pretty --json-summary "${outputlocation}/summary.json" --json "${outputlocation}/coverage-raw.json"
@@ -205,21 +200,11 @@ if [ ! "$skipgcovroption" = "yes" ]; then
     # Second pass, generate html
     gcovr "${GCOVR_EXTRA_OPTIONS[@]}" -a "$outputlocation/coverage-fixed.json" --merge-mode-functions separate --sort uncovered-percent --html-nested --html-template-dir=ci-automation/gcovr-templates/html --html-title "$REPONAME" --merge-lines --exclude-unreachable-branches --exclude-throw-branches --exclude '.*/test/.*' --exclude '.*/extra/.*' --exclude '.*/example/.*' --exclude '.*/examples/.*' --html --output "${outputlocation}/index.html" --json-summary-pretty --json-summary "$outputlocation/summary.json"
 
-    # Second pass, generate html flat
-    # gcovr -a "$outputlocation/coverage-fixed.json" --merge-mode-functions separate --sort uncovered-percent --html-details --html-template-dir=ci-automation/gcovr-templates/html --html-title "$REPONAME" --merge-lines --exclude-unreachable-branches --exclude-throw-branches --exclude '.*/test/.*' --exclude '.*/extra/.*' --exclude '.*/example/.*' --exclude '.*/examples/.*' --html --output "${outputlocation_flat}/index.html" --json-summary-pretty --json-summary "${outputlocation_flat}/summary.json"
-
-    # again, temporarily try without templates
-    gcovr "${GCOVR_EXTRA_OPTIONS[@]}" -a "$outputlocation/coverage-fixed.json" --merge-mode-functions separate --sort uncovered-percent --html-details --html-title "$REPONAME" --merge-lines --exclude-unreachable-branches --exclude-throw-branches --exclude '.*/test/.*' --exclude '.*/extra/.*' --exclude '.*/example/.*' --exclude '.*/examples/.*' --html --output "${outputlocation_flat}/index.html" --json-summary-pretty --json-summary "${outputlocation_flat}/summary.json"
-
     ls -al "${outputlocation}"
 
     # Generate tree.json for sidebar navigation
     python3 "ci-automation/scripts/gcovr_build_tree.py" "${outputlocation}"
 
-    # Generate tree.json for sidebar navigation - flat
-    # temporarily testing 
-    # python3 "ci-automation/scripts/gcovr_build_tree.py" "${outputlocation_flat}"
-
     # Generate coverage badges
     python3 "ci-automation/scripts/generate_badges.py" "$outputlocation" --json "$outputlocation/summary.json"