Changing coversheet template to use in merge request

.gitlab-ci.yml

@@ -38,14 +38,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=newCoversheet" >> 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_end%2Edocx/raw?ref=master" >> 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=newCoversheet" >> onem2m_coversheet_template.docx
     - |
      curl --request POST --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_MERGE_REQUEST_PROJECT_ID}/protected_branches?name=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"
   script:

generateChangemarks/changemarks.py

@@ -296,6 +296,10 @@ def process(document:str, outDirectory:str, mr:MR) -> None:
                 sourceMdLines = sourceText.splitlines(keepends=False)
                 clauses = find_all_clauses(progress, sourceMdLines)
                 changed_clauses = find_changed_clauses(progress, sourceMdLines, clauses, mr, outDirectory)
+                #Export list of changed clauses
+                with open(f'{outDirectory}/changedClauses.txt', "w", encoding='utf-8', errors='replace') as f:
+                    f.write("\n".join([clause.clause_nr for clause in changed_clauses]))
+                    f.close()
 
 def main(args=None):
     # Parse command line arguments

generate_changemarks.sh

 #!/bin/bash
 
-FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.5.0
-GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:master
+FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.10.0-bis
+GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:newCoversheet
 DOCKER_IMAGE=pandoc/core:3.1.1.0
 
 echo "\n------ Checking for docker image --------"
@@ -37,7 +37,7 @@ 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"
+docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "out/" --preprocessor onem2m --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3"
 
 echo "\n------ Converting to tracked changes docx --------"
 for i in docs/*.docx ; do