diff --git a/generateChangemarks/.gitlab-ci.yml b/generateChangemarks/.gitlab-ci.yml index 399d9e243bcdca42973fca96847d2af26238a325..b5cd5568f00a62e1087454f138a7b9d0aa6f3889 100644 --- a/generateChangemarks/.gitlab-ci.yml +++ b/generateChangemarks/.gitlab-ci.yml @@ -26,7 +26,7 @@ Word CR: - merge_requests before_script: - | - curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generate_changemarks%2Esh/raw?ref=master" >> generate_changemarks.sh + curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generate_changemarks%2Esh/raw?ref=addDiffCR" >> generate_changemarks.sh - chmod +x generate_changemarks.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_delimiter_start%2Edocx/raw?ref=master" >> onem2m_delimiter_start.docx diff --git a/generate_changemarks.sh b/generate_changemarks.sh index df51f20257c0d31e09e06893a89368c3e86e6823..4e192a6ef44dc9b9b93971aba62c73b70e16d0e3 100644 --- a/generate_changemarks.sh +++ b/generate_changemarks.sh @@ -44,5 +44,11 @@ for i in docs/*.docx ; do DOCUMENT_NAME=$(echo $i | cut -d'/' -f 2) docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$GENERATE_CHANGEMARKS_DOCKER_IMAGE" addTrackedChanges -o "/tmp/docs/$DOCUMENT_NAME" "/tmp/$i" "$HOST_URL" "$2" "$3" done +for filename in docs/*.docx; do + mv $filename ${filename%.*}_Word.docx; done; + #mv "$filename" "prefix_${filename}"; done; + +echo "\n------ Generating change marks --------" +docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv --combine --diffs --preprocessor onem2m --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3" exit 0