Commit 58b998e9 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Include filename in change numbering

parent c4f861fd

sa5/.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -98,12 +98,12 @@ Word CR text: 
    - merge_requests

  before_script:

    - |

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fgenerate_changemarks%2Esh/raw?ref=master" >> generate_changemarks.sh

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fgenerate_changemarks%2Esh/raw?ref=sa5test" >> generate_changemarks.sh

    - chmod +x generate_changemarks.sh

    - |

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_delimiter_start%2Edocx/raw?ref=master" >> sa5_delimiter_start.docx

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_delimiter_start%2Edocx/raw?ref=sa5test" >> sa5_delimiter_start.docx

    - |

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_delimiter_end%2Edocx/raw?ref=master" >> sa5_delimiter_end.docx

     curl "${CI_API_V4_URL}/projects/$TOOLS_3GPP_SCRIPTS_PROJECT_ID/repository/files/sa5%2Fsa5_delimiter_end%2Edocx/raw?ref=sa5test" >> sa5_delimiter_end.docx

  script:

    - echo 'CR contribution'

    - mkdir docs

sa5/generate_changemarks.sh

+2 −2
Original line number Diff line number Diff line 
#!/bin/bash



DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.2.0

DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:miguel



echo "\n------ Checking for docker image --------"

docker pull "$DOCKER_IMAGE"
@@ -18,7 +18,7 @@ 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"

docker container run --rm -v $(pwd):/tmp/ "$DOCKER_IMAGE" forgelib-changedocs -vv --combine --filename --outPath=/tmp/docs --startdelimiter "/tmp/$4" --enddelimiter "/tmp/$5" "$HOST_URL" "$2" "$PROJECT_NAME" "$3"



exit 0