Commit 166c7e16 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'feat/mr-workflow' into 'main'

make MR pipeline the default workflow

See merge request to-be-continuous/defectdojo!24
parents 3c53c549 ee00f934
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
# default workflow rules
# default workflow rules: Merge Request pipelines
workflow:
  rules:
    # exclude merge requests
    - if: $CI_MERGE_REQUEST_ID
    # prevent branch pipeline when an MR is open (prefer MR pipeline)
    - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
      when: never
    - when: always

@@ -294,14 +294,14 @@ variables:

    if [ "$nb_reports" -gt 0 ]; then
      # prepare engagement creation
      _engname="Engagement ${_today_time} $CI_COMMIT_BRANCH $CI_COMMIT_SHORT_SHA"
      _engname="Engagement ${_today_time} $CI_COMMIT_REF_NAME $CI_COMMIT_SHORT_SHA"
      _end=${_today}
      branch_tag=$CI_COMMIT_TAG
      branch_tag_info="[${CI_COMMIT_TAG}](${CI_PROJECT_URL}/-/tags/${CI_COMMIT_TAG})"
      # if there is no tag, then use branch
      if [[ -z "$CI_COMMIT_TAG" ]]; then
        branch_tag=$CI_COMMIT_BRANCH
        branch_tag_info="[${CI_COMMIT_BRANCH}](${CI_PROJECT_URL}/-/tree/${CI_COMMIT_BRANCH})"
        branch_tag=$CI_COMMIT_REF_NAME
        branch_tag_info="[${CI_COMMIT_REF_NAME}](${CI_PROJECT_URL}/-/tree/${CI_COMMIT_REF_NAME})"
      fi
      dashboard_template_version=$(get_tpl_version_in_use "to-be-continuous/defectdojo")
      commit_info="[commit ${CI_COMMIT_SHORT_SHA}](${CI_PROJECT_URL}/-/commit/${CI_COMMIT_SHA})\n${branch_tag_info}\ncreated with dashboard-template ${dashboard_template_version}"