Commit 81754bff authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Update forgelib version + merge request against CI_COMMIT_BRANCH

parent d626d94e

common-openapi/.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ Generation of OpenAPI: 
       --data "{

         \"id\": \"$CI_PROJECT_ID\",

         \"source_branch\": \"openapi-update-$version\",

         \"target_branch\": \"$CI_DEFAULT_BRANCH\",

         \"target_branch\": \"$CI_COMMIT_BRANCH\",

         \"title\": \"Update OpenAPI files to version $version\",

         \"description\": \"Automatically generated OpenAPI files from specification version $version\",

         \"remove_source_branch\": true

common-openapi/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.0.0

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



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 --outPath=/tmp/docs "$HOST_URL" "$2" "$PROJECT_NAME" "$3"

docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) "$DOCKER_IMAGE" forgelib-changedocs -vv --diffs --combine --outPath=/tmp/docs "$HOST_URL" "$2" "$3"

#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