diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a53395a58dd9765dd4f3b67ba0cc3bafc2b476a..7d81ddd07e909b05fcdd2e121aa8d06e568c4452 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/generateChangemarks/changemarks.py b/generateChangemarks/changemarks.py index bcc8ff527619ec777f5827e61eb49de850c9781d..4fe0b05ad52bb33fb7cf9e2dab0d6ca0de3f6926 100644 --- a/generateChangemarks/changemarks.py +++ b/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 diff --git a/generate_changemarks.sh b/generate_changemarks.sh index 6de8fbbba1b9c908faa30f0288c3998513c1382f..9259559688e698578eeddb1508aeda9cf7cd57c8 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: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 diff --git a/onem2m_coversheet_template.docx b/onem2m_coversheet_template.docx index a6113679db7a6bc49b001777ca276d4d62c880fe..2f07b09e8434746300b5c9dbfd040062501d5109 100644 Binary files a/onem2m_coversheet_template.docx and b/onem2m_coversheet_template.docx differ