From 4ae6fe52cbd9cda29e084abb7779c899fac82f8c Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 15 Aug 2023 15:17:25 +0200
Subject: [PATCH] Removed track changes conversion
---
.gitlab-ci.yml | 10 +++++-----
generate_changemarks.sh | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5c6a98..674d161 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
@@ -37,14 +37,14 @@ Word CR text:
- 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=testTables" >> 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
+ curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_delimiter_start%2Edocx/raw?ref=testTables" >> onem2m_delimiter_start.docx
- |
- curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_delimiter_end%2Edocx/raw?ref=master" >> onem2m_delimiter_end.docx
+ curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_delimiter_end%2Edocx/raw?ref=testTables" >> onem2m_delimiter_end.docx
- |
- curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_coversheet_template%2Edocx/raw?ref=master" >> onem2m_coversheet_template.docx
+ curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/onem2m_coversheet_template%2Edocx/raw?ref=testTables" >> onem2m_coversheet_template.docx
script:
- echo 'CR contribution'
- mkdir docs
diff --git a/generate_changemarks.sh b/generate_changemarks.sh
index d410f16..3a384bb 100644
--- a/generate_changemarks.sh
+++ b/generate_changemarks.sh
@@ -1,7 +1,7 @@
#!/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:testTables
DOCKER_IMAGE=pandoc/core:3.1.1.0
echo "\n------ Checking for docker image --------"
@@ -36,9 +36,9 @@ 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"
echo "\n------ Converting to tracked changes docx --------"
-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 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
exit 0
\ No newline at end of file
--
GitLab