Commit 3e4bf620 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch 'feat/component' into 'master' 

GitLab CI/CD component migration

See merge request to-be-continuous/maven!74
parents 5996b0cd 5c32520f

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ include: 
    file: '/templates/validation.yml'

  - project: 'to-be-continuous/bash'

    ref: '3.3'

    file: 'templates/gitlab-ci-bash.yml'

    file: '/templates/gitlab-ci-bash.yml'

  - project: 'to-be-continuous/semantic-release'

    ref: '3.7'

    file: '/templates/gitlab-ci-semrel.yml'

README.md

+76 −55

File changed.

Preview size limit exceeded, changes collapsed.

bumpversion.sh

+2 −2
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ if [[ "$curVer" ]]; then 
  log_info "Bump version from \\e[33;1m${curVer}\\e[0m to \\e[33;1m${nextVer}\\e[0m (release type: $relType)..."



  # replace in README

  sed -e "s/ref: '$curVer'/ref: '$nextVer'/" README.md > README.md.next

  sed -e "s/ref: *'$curVer'/ref: '$nextVer'/" -e "s/ref: *\"$curVer\”/ref: \”$nextVer\”/" -e "s/component: *\(.*\)@$curVer/component: \1@$nextVer/" README.md > README.md.next

  mv -f README.md.next README.md



  # replace in template and variants

  for tmpl in templates/*.yml

  do

    sed -e "s/\"$curVer\"/\"$nextVer\"/" "$tmpl" > "$tmpl.next"

    sed -e "s/command: *\[\"--service\", \"\(.*\)\", \"$curVer\"\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"

    mv -f "$tmpl.next" "$tmpl"

  done

else

kicker.json

+101 −93
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
  "description": "Build, test and analyse your [Maven](https://maven.apache.org/)-based projects",

  "template_path": "templates/gitlab-ci-maven.yml",

  "kind": "build",

  "prefix": "maven",

  "is_component": true,

  "variables": [

    {

      "name": "MAVEN_IMAGE",
@@ -231,7 +233,13 @@ 
            {

              "name": "MAVEN_TRIVY_SECURITY_LEVEL_THRESHOLD",

              "type": "enum",

			 "values": ["UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL", "LOW,MEDIUM,HIGH,CRITICAL", "MEDIUM,HIGH,CRITICAL", "HIGH,CRITICAL", "CRITICAL"],

              "values": [

                "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL",

                "LOW,MEDIUM,HIGH,CRITICAL",

                "MEDIUM,HIGH,CRITICAL",

                "HIGH,CRITICAL",

                "CRITICAL"

              ],

              "description": "Severities of vulnerabilities to be displayed (comma separated values: `UNKNOWN`, `LOW`, `MEDIUM`, `HIGH`, `CRITICAL`)",

              "default": "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL"

            },

logo.png

−5.29 KiB (12.7 KiB)
Loading image diff...