Loading pipeline/.gitlab-ci.yml +15 −15 Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ Checking conflicts: - git clone "https://$CI_SERVER_HOST/$CI_PROJECT_PATH.git" ${CI_PROJECT_NAME} script: - echo 'Checking conflicts' - ./generateCR/checking_conflicts.sh ${CI_API_V4_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${MERGE_REQUEST_MILESTONE} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} ${CI_MERGE_REQUEST_IID} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} ${CI_PROJECT_NAME} "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $MIKE_ACCESS_TOKEN - /generateCR/checking_conflicts.sh ${CI_API_V4_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${MERGE_REQUEST_MILESTONE} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} ${CI_MERGE_REQUEST_IID} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} ${CI_PROJECT_NAME} "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $MIKE_ACCESS_TOKEN artifacts: when: on_failure paths: Loading @@ -61,16 +61,16 @@ Word CR: when: on_success before_script: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateCR%2Fgenerate_changemarks%2Esh/raw?ref=master" >> generate_changemarks.sh curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fgenerate_changemarks%2Esh/raw?ref=restructure" >> generate_changemarks.sh - chmod +x generate_changemarks.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_start%2Edocx/raw?ref=master" >> onem2m_delimiter_start.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_start%2Edocx/raw?ref=restructure" >> onem2m_delimiter_start.docx - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_end%2Edocx/raw?ref=master" >> onem2m_delimiter_end.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_end%2Edocx/raw?ref=restructure" >> onem2m_delimiter_end.docx - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_coversheet_template%2Edocx/raw?ref=master" >> onem2m_coversheet_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_coversheet_template%2Edocx/raw?ref=restructure" >> onem2m_coversheet_template.docx - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=restructure" >> onem2m_spec_template.docx script: - echo 'CR contribution' - mkdir docs Loading @@ -89,10 +89,10 @@ Baseline contribution: when: on_success before_script: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=master" >> publish_spec.sh curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=restructure" >> publish_spec.sh - chmod +x publish_spec.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=restructure" >> onem2m_spec_template.docx - | export SPEC_NAME=$(ls | grep T*.md | cut -d'.' -f1) export BASELINE_VERSION=$(echo ${CI_MERGE_REQUEST_TITLE} | grep -o v.*_baseline | cut -d'_' -f1-3 ) Loading Loading @@ -124,10 +124,10 @@ Publish spec: - tags before_script: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=master" >> publish_spec.sh curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=restructure" >> publish_spec.sh - chmod +x publish_spec.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=restructure" >> onem2m_spec_template.docx - | export SPEC_NAME=$(ls | grep -E "(TS|TR|WI).*\.md" | cut -d'.' -f1) script: Loading Loading @@ -177,13 +177,13 @@ pages: - apt-get update -qq && apt-get -qq install -y git curl > /dev/null # Retrieval of required files from tools/scripts - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2Ffavicon%2Eico/raw?ref=master" >> favicon.html curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateSpecWebSite%2Fimages%2Ffavicon%2Eico/raw?ref=restructure" >> favicon.html - mkdir -p docs/images && mv favicon.html docs/images/ - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2Fonem2m%2Epng/raw?ref=master" >> onem2m.png curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateSpecWebSite%2Fimages%2Fonem2m%2Epng/raw?ref=restructure" >> onem2m.png - mv onem2m.png docs/images/ - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2Fonem2m_sq%2Epng/raw?ref=master" >> onem2m_sq.png curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateSpecWebSite%2Fimages%2Fonem2m_sq%2Epng/raw?ref=restructure" >> onem2m_sq.png - mv onem2m_sq.png docs/images/ #- | # curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2FWord%2Epng/raw?ref=master" >> Word.png Loading Loading @@ -218,7 +218,7 @@ pages: - echo "'$TAG_NAME'" script: - ./generateSpecWebSite/spec_on_pages.sh generateSpecWebSite/toMkdocs.py $MIKE_ACCESS_TOKEN $CI_SERVER_HOST $CI_PROJECT_PATH "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $CI_COMMIT_SHA $SPEC_NAME $CI_PROJECT_NAME $TAG_NAME $CLEAN_WEB_PAGES - /generateSpecWebSite/spec_on_pages.sh generateSpecWebSite/toMkdocs.py $MIKE_ACCESS_TOKEN $CI_SERVER_HOST $CI_PROJECT_PATH "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $CI_COMMIT_SHA $SPEC_NAME $CI_PROJECT_NAME $TAG_NAME $CLEAN_WEB_PAGES artifacts: paths: - public/ No newline at end of file pipeline/generate_changemarks.sh 100644 → 100755 +0 −0 File mode changed from 100644 to 100755. View file Loading
pipeline/.gitlab-ci.yml +15 −15 Original line number Diff line number Diff line Loading @@ -45,7 +45,7 @@ Checking conflicts: - git clone "https://$CI_SERVER_HOST/$CI_PROJECT_PATH.git" ${CI_PROJECT_NAME} script: - echo 'Checking conflicts' - ./generateCR/checking_conflicts.sh ${CI_API_V4_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${MERGE_REQUEST_MILESTONE} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} ${CI_MERGE_REQUEST_IID} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} ${CI_PROJECT_NAME} "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $MIKE_ACCESS_TOKEN - /generateCR/checking_conflicts.sh ${CI_API_V4_URL} ${CI_MERGE_REQUEST_PROJECT_ID} ${MERGE_REQUEST_MILESTONE} ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} ${CI_MERGE_REQUEST_IID} ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME} ${CI_PROJECT_NAME} "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $MIKE_ACCESS_TOKEN artifacts: when: on_failure paths: Loading @@ -61,16 +61,16 @@ Word CR: when: on_success before_script: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateCR%2Fgenerate_changemarks%2Esh/raw?ref=master" >> generate_changemarks.sh curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fgenerate_changemarks%2Esh/raw?ref=restructure" >> generate_changemarks.sh - chmod +x generate_changemarks.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_start%2Edocx/raw?ref=master" >> onem2m_delimiter_start.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_start%2Edocx/raw?ref=restructure" >> onem2m_delimiter_start.docx - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_end%2Edocx/raw?ref=master" >> onem2m_delimiter_end.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_delimiter_end%2Edocx/raw?ref=restructure" >> onem2m_delimiter_end.docx - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_coversheet_template%2Edocx/raw?ref=master" >> onem2m_coversheet_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fonem2m_coversheet_template%2Edocx/raw?ref=restructure" >> onem2m_coversheet_template.docx - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=restructure" >> onem2m_spec_template.docx script: - echo 'CR contribution' - mkdir docs Loading @@ -89,10 +89,10 @@ Baseline contribution: when: on_success before_script: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=master" >> publish_spec.sh curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=restructure" >> publish_spec.sh - chmod +x publish_spec.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=restructure" >> onem2m_spec_template.docx - | export SPEC_NAME=$(ls | grep T*.md | cut -d'.' -f1) export BASELINE_VERSION=$(echo ${CI_MERGE_REQUEST_TITLE} | grep -o v.*_baseline | cut -d'_' -f1-3 ) Loading Loading @@ -124,10 +124,10 @@ Publish spec: - tags before_script: - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=master" >> publish_spec.sh curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2Fpublish_spec%2Esh/raw?ref=restructure" >> publish_spec.sh - chmod +x publish_spec.sh - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=master" >> onem2m_spec_template.docx curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/pipeline%2FSpec-template%2Edocx/raw?ref=restructure" >> onem2m_spec_template.docx - | export SPEC_NAME=$(ls | grep -E "(TS|TR|WI).*\.md" | cut -d'.' -f1) script: Loading Loading @@ -177,13 +177,13 @@ pages: - apt-get update -qq && apt-get -qq install -y git curl > /dev/null # Retrieval of required files from tools/scripts - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2Ffavicon%2Eico/raw?ref=master" >> favicon.html curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateSpecWebSite%2Fimages%2Ffavicon%2Eico/raw?ref=restructure" >> favicon.html - mkdir -p docs/images && mv favicon.html docs/images/ - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2Fonem2m%2Epng/raw?ref=master" >> onem2m.png curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateSpecWebSite%2Fimages%2Fonem2m%2Epng/raw?ref=restructure" >> onem2m.png - mv onem2m.png docs/images/ - | curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2Fonem2m_sq%2Epng/raw?ref=master" >> onem2m_sq.png curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/generateSpecWebSite%2Fimages%2Fonem2m_sq%2Epng/raw?ref=restructure" >> onem2m_sq.png - mv onem2m_sq.png docs/images/ #- | # curl "${CI_API_V4_URL}/projects/$TOOLS_SCRIPTS_PROJECT_ID/repository/files/toMkdocs%2Fimages%2FWord%2Epng/raw?ref=master" >> Word.png Loading Loading @@ -218,7 +218,7 @@ pages: - echo "'$TAG_NAME'" script: - ./generateSpecWebSite/spec_on_pages.sh generateSpecWebSite/toMkdocs.py $MIKE_ACCESS_TOKEN $CI_SERVER_HOST $CI_PROJECT_PATH "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $CI_COMMIT_SHA $SPEC_NAME $CI_PROJECT_NAME $TAG_NAME $CLEAN_WEB_PAGES - /generateSpecWebSite/spec_on_pages.sh generateSpecWebSite/toMkdocs.py $MIKE_ACCESS_TOKEN $CI_SERVER_HOST $CI_PROJECT_PATH "$GITLAB_USER_NAME" $GITLAB_USER_EMAIL $CI_COMMIT_SHA $SPEC_NAME $CI_PROJECT_NAME $TAG_NAME $CLEAN_WEB_PAGES artifacts: paths: - public/ No newline at end of file
pipeline/generate_changemarks.sh 100644 → 100755 +0 −0 File mode changed from 100644 to 100755. View file