diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2fa7b50efa957b3a1e1b71a5ea20ba4be94773b7..1c78931f3f8fea24a46bfc255eb615355a16df71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,10 +25,12 @@ Word CR text: 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%2Edoc/raw?ref=master" >> onem2m_coversheet_template.doc script: - echo 'CR contribution' - mkdir docs - - ./generate_changemarks.sh ${CI_PROJECT_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${CI_MERGE_REQUEST_IID} onem2m_delimiter_start.docx onem2m_delimiter_end.docx + - ./generate_changemarks.sh ${CI_PROJECT_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${CI_MERGE_REQUEST_IID} onem2m_delimiter_start.docx onem2m_delimiter_end.docx onem2m_coversheet_template.doc artifacts: paths: - docs/ diff --git a/generate_changemarks.sh b/generate_changemarks.sh index 77885199e3bd686b46079d0bff22899fda4426a2..04b53a475b09908bb27f04dba9275b661e6f9b05 100644 --- a/generate_changemarks.sh +++ b/generate_changemarks.sh @@ -11,14 +11,13 @@ rm **/*.docx echo "------ Parsing repo URL --------" HOST_URL=$(echo $1 | cut -d'/' -f 1-3) -PROJECT_NAME=$(echo $1 | cut -d'/' -f 5- | cut -d'.' -f 1) +PROJECT_NAME=$(echo $1 | cut -d'/' -f 4- | cut -d'.' -f 1) echo "HOST URL:" $HOST_URL echo "PROJECT NAME:" $PROJECT_NAME echo "PROJECT ID:" $2 echo "MERGE IID:" $3 echo "\n------ Generating change marks --------" -docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$PROJECT_NAME" "$3" - -exit 0 +docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" --coversheet "/tmp/$6" "$HOST_URL" "$2" "$PROJECT_NAME" "$3" +exit 0 \ No newline at end of file diff --git a/onem2m_coversheet_template.doc b/onem2m_coversheet_template.doc new file mode 100644 index 0000000000000000000000000000000000000000..ea10becf77402c61e91879f6d023ce7dc0ce2dac Binary files /dev/null and b/onem2m_coversheet_template.doc differ