From 5090c8ac76395554a40b639bdb2345a950144dcf Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 29 Feb 2024 10:37:49 +0100
Subject: [PATCH] Producing also diff CR
---
generateChangemarks/.gitlab-ci.yml | 2 +-
generate_changemarks.sh | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/generateChangemarks/.gitlab-ci.yml b/generateChangemarks/.gitlab-ci.yml
index 399d9e2..b5cd556 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 df51f20..4e192a6 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
--
GitLab