Commit 5655be2e authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Handle frontmatter if generated, do nothing otherwise (assuming md contains the whole document)

parent 0ac786ac

specifications/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ Publish spec: 
    - tags

  before_script:

    - |

     curl "${CI_API_V4_URL}/projects/$PIPELINE_SCRIPTS_PROJECT_ID/repository/files/specifications%2Fpublish_spec%2Esh/raw?ref=main" >> publish_spec.sh

     curl "${CI_API_V4_URL}/projects/$PIPELINE_SCRIPTS_PROJECT_ID/repository/files/specifications%2Fpublish_spec%2Esh/raw?ref=frontmatter" >> publish_spec.sh

    - chmod +x publish_spec.sh

    - |

     curl "${CI_API_V4_URL}/projects/$PIPELINE_SCRIPTS_PROJECT_ID/repository/files/specifications%2FSpec-template%2Edocx/raw?ref=main" >> mec_spec_template.docx

specifications/publish_spec.sh

+5 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 


PANDOC_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/generatebaseline/pandoc:master

GENERATE_BASELINE_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/generatebaseline:master

MARKDOWN_TOOLS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/markdowntools:master

MARKDOWN_TOOLS_DOCKER_IMAGE=forge.etsi.org:5050/cti/md-specs-dev/tools/markdowntools:frontmatter

FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.25.0



echo "\n------ Checking for docker image --------"
@@ -61,7 +61,7 @@ for i in *.md ; do 
    if [ $i != 'README.md' ]; then

    	if [[ $i =~ (GS|GR).*\.md ]] ; then

        	echo "\n------ Processing MD file to combine all clauses (::include) -------"

            docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$MARKDOWN_TOOLS_DOCKER_IMAGE" processMDSpec -fmo "$i" > frontmatter.md

            docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$MARKDOWN_TOOLS_DOCKER_IMAGE" processMDSpec -fmo "$i" -fmf frontmatter.md

            docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$MARKDOWN_TOOLS_DOCKER_IMAGE" processMDSpec "$i" > combined.md

            cat combined.md > $i

			echo "\n------ Adding TOC to spec --------"
@@ -74,7 +74,9 @@ for i in *.md ; do 
	    # Word output

	    docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) -w "/data" "$PANDOC_DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t docx --reference-doc "/data/${3}" -o "baseline/${4}_${2}.docx"

	    #echo 'docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -F mermaid-filter -f markdown+escaped_line_breaks -t pdf -o "${4}_${2}.pdf"'

	    if [ -f "frontmatter.md" ] && [ -s "frontmatter.md" ]; then

	        docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-baseline $5 frontmatter.md "baseline/${4}_${2}.docx"

	    fi

		#if [ "$6" != "onlyDocx" ]; then

			#Do not convert to PDF or EPUB until a solution is found to include the spec cover pages

			# PDF Output