Adding notes to the CR (80971ae7) · Commits · Centre for Testing and Interoperability / Markdown specifications development / Specification tools

generateChangemarks/.gitlab-ci.yml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -63,7 +63,7 @@ Word CR:
	when: on_success		when: on_success
	before_script:		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=detailsConflicts" >> generate_changemarks.sh
	- chmod +x 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_start%2Edocx/raw?ref=master" >> onem2m_delimiter_start.docx
	@@ -76,7 +76,7 @@ Word CR:
	script:		script:
	- echo 'CR contribution'		- echo 'CR contribution'
	- mkdir docs		- 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 onem2m_coversheet_template.docx onem2m_spec_template.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.docx onem2m_spec_template.docx $PIPELINE_ACCESS_TOKEN
	artifacts:		artifacts:
	paths:		paths:
	- docs/		- docs/

generate_changemarks.sh

+3 −3

Original line number	Original line	Diff line number	Diff line
	#!/bin/bash		#!/bin/bash

	FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:v2.15.0		FORGELIB_DOCKER_IMAGE=forge.3gpp.org:5050/tools/3gpp-scripts/forgelib:addnotes
	GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:master		GENERATE_CHANGEMARKS_DOCKER_IMAGE=generatechangemarks:master
	DOCKER_IMAGE=pandoc/core:3.1.1.0		DOCKER_IMAGE=pandoc/core:3.1.1.0

	@@ -37,7 +37,7 @@ done

	echo "\n------ Combining docx --------"		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"		docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv -sf "out/" --preprocessor onem2m --token ${8} --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3"

	echo "\n------ Converting to tracked changes docx --------"		echo "\n------ Converting to tracked changes docx --------"
	for i in docs/*.docx ; do		for i in docs/*.docx ; do
	@@ -49,6 +49,6 @@ for filename in docs/*.docx; do
	#mv "$filename" "prefix_${filename}"; done;		#mv "$filename" "prefix_${filename}"; done;

	echo "\n------ Generating change marks --------"		echo "\n------ Generating change marks --------"
	docker container run --rm -v $(pwd):/tmp/ -u $(id -u):$(id -g) -w "/tmp" "$FORGELIB_DOCKER_IMAGE" forgelib-changedocs -vv --combine --diffs --extension "png" --extension "jpg" --extension "svg" --extension "md" --preprocessor onem2m --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$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 --combine --diffs --extension "png" --extension "jpg" --extension "svg" --extension "md" --preprocessor onem2m --token ${8} --outPath=docs/ --startdelimiter "$4" --enddelimiter "$5" --coversheet "$6" "$HOST_URL" "$2" "$3"

	exit 0		exit 0

Admin message