Commit 9660359b authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Fix coversheet template

parent bf5299b3

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ stages: 
Build pythonForPandocFilter docker image:

  stage: build

  before_script: cd generateChangemarks

  script: docker build --tag generatechangemarks:latest -f dockerfile .

  script: docker build --tag generatechangemarks:$CI_COMMIT_BRANCH -f dockerfile .

  rules:

    - if: $CI_COMMIT_BRANCH

      changes:

generate_changemarks.sh

+5 −2
Original line number Diff line number Diff line 
#!/bin/bash



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

GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:latest

GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:master

DOCKER_IMAGE=pandoc/core:3.1.1.0



echo "\n------ Checking for docker image --------"
@@ -30,9 +30,12 @@ for i in out/*.md ; do 
	docker run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" pandocFilter -o "/tmp/out" "/tmp/$i"

	echo "\n------ Publishing spec --------" 

	docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t docx --reference-doc "Spec-template.docx" -o "/data/out/${DOCUMENT_NAME}.docx"

    #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/$i" -f markdown -t html -o "/data/out/${DOCUMENT_NAME}.html"

    #docker run --rm -v $(pwd):/data -u $(id -u):$(id -g) "$DOCKER_IMAGE" "/data/out/${DOCUMENT_NAME}.html" -f html -t docx --reference-doc "Spec-template.docx" -o "/data/out/${DOCUMENT_NAME}.docx"

done



echo "\n------ Combining docx --------"

#docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "/tmp/out/" --preprocessor onem2m --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$3"

docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "/tmp/out/" --preprocessor onem2m --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$3"



echo "\n------ Converting to tracked changes docx --------"

onem2m_coversheet_template.docx

−386 B (40.9 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file