diff --git a/generateChangemarks/.gitlab-ci.yml b/generateChangemarks/.gitlab-ci.yml index 77dfe8c555841dada68308b25820d578a50a0812..5aa02da895853551a49db1d382cca34518a0553c 100644 --- a/generateChangemarks/.gitlab-ci.yml +++ b/generateChangemarks/.gitlab-ci.yml @@ -93,7 +93,7 @@ Publish spec: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/Spec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx - | - export SPEC_NAME=$(ls | grep T*.md | cut -d'.' -f1) + export SPEC_NAME=$(ls | grep -E "(TS|TR|WI).*\.md" | cut -d'.' -f1) script: - echo 'Publishing spec' - ./publish_spec.sh ${CI_PROJECT_URL} ${CI_COMMIT_TAG} onem2m_spec_template.docx $SPEC_NAME @@ -168,7 +168,7 @@ pages: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2FtoMkdocs%2Epy/raw?ref=master" >> toMkdocs.py - | - export SPEC_NAME=$(ls | grep T*.md | cut -d'.' -f1) + export SPEC_NAME=$(ls | grep -E "(TS|TR|WI).*\.md" | cut -d'.' -f1) - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/spec_on_pages%2Esh/raw?ref=master" >> spec_on_pages.sh - chmod +x spec_on_pages.sh diff --git a/publish_spec.sh b/publish_spec.sh index 70d912d664d1fb251f0061ebb63c3f8890df24d2..7af8d2e0fc4acdc0c2f37e8709a305e15272466c 100755 --- a/publish_spec.sh +++ b/publish_spec.sh @@ -34,12 +34,14 @@ done for i in *.md ; do if [ $i != 'README.md' ]; then - echo "\n------ Adding TOC to spec --------" - docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$TOOLS_DOCKER_IMAGE" generateTOC --add-content "/tmp/$i" + if [[ $i =~ '(TS|TR).*\.md' ]] ; then + echo "\n------ Adding TOC to spec --------" + docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$TOOLS_DOCKER_IMAGE" generateTOC --add-content "/tmp/$i" + fi echo "\n------ Preparaing spec --------" docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$TOOLS_DOCKER_IMAGE" pandocFilter -o "/tmp/" "/tmp/$i" echo "\n------ Publishing spec --------" - mkdir baseline + mkdir baseline # Word output docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$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"' diff --git a/spec_on_pages.sh b/spec_on_pages.sh index afb68b1a6563fce9fdcca42721ad21c75d532dd1..006027720dbee09fd9278fa32bffd98eab0f3cb6 100644 --- a/spec_on_pages.sh +++ b/spec_on_pages.sh @@ -40,6 +40,7 @@ git checkout $7 ####### GENERATE NAV SPEC ####### echo "------ Generate input for mkdocs --------" python3 $1 -it -ihp --title ${9^^} "./$8.md" +ls ${9^^} echo "------ Move to docs folder --------" mv ${9^^}/* docs/ sed -i 's/'${9^^}'\///g' _nav.yml