Commit df3a46f1 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

feat: move group

parent 6d60254c

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line 
include:

  - project: 'Orange-OpenSource/tbc/tools/gitlab-ci'

  - project: 'to-be-continuous/tools/gitlab-ci'

    ref: 'master'

    file: '/templates/validation.yml'

  - project: 'Orange-OpenSource/tbc/kicker'

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

    ref: 'master'

    file: '/templates/validation.yml'

  - project: 'Orange-OpenSource/tbc/bash'

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

    ref: '1.0.0'

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

CONTRIBUTE.md

+2 −2
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ Git commits in _to be continuous_ shall be: 
1. **atomic** (1 commit `=` 1 and only 1 _thing_),

2. **semantic** (using [semantic-release commit message syntax](https://semantic-release.gitbook.io/semantic-release/#commit-message-format)).



You'll find extensive information about Git commit conventions on the [reference documentation website](https://orange-opensource.gitlab.io/tbc/doc/dev/workflow/#git-commit-guidelines).

You'll find extensive information about Git commit conventions on the [reference documentation website](https://to-be-continuous.gitlab.io/doc/dev/workflow/#git-commit-guidelines).



### Coding Guidelines



The extensive _to be continuous_ coding guidelines can be found on the [reference documentation website](https://orange-opensource.gitlab.io/tbc/doc/dev/guidelines/).
 
The extensive _to be continuous_ coding guidelines can be found on the [reference documentation website](https://to-be-continuous.gitlab.io/doc/dev/guidelines/).

README.md

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ In order to include this template in your project, add the following to your `gi 


```yaml

include:

  - project: 'Orange-OpenSource/tbc/maven'

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

    ref: '1.3.0'

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

```
@@ -179,14 +179,14 @@ More info: 


#### `semantic-release` integration



If you activate the [`semantic-release-info` job from the `semantic-release` template](https://gitlab.com/Orange-OpenSource/tbc/semantic-release/#semantic-release-info-job), the `mvn-release` job will rely on the generated next version info.

If you activate the [`semantic-release-info` job from the `semantic-release` template](https://gitlab.com/to-be-continuous/semantic-release/#semantic-release-info-job), the `mvn-release` job will rely on the generated next version info.



* the release will only be performed if a next semantic release is present

* the version is passed to the maven release plugin as release version argument adding `-DreleaseVersion=${SEMREL_INFO_NEXT_VERSION}` to the `MAVEN_RELEASE_ARGS` value



:warning: Both maven release plugin and semantic-release use a dedicated tag format that need to be set accordingly.

By default maven release plugin uses `${artifactId}-${version}` and semantic-release uses `s${version}`

For exemple you can modify the semantic-release tag format with the `SEMREL_TAG_FORMAT` variable (see [semantic-release template variables](https://gitlab.com/Orange-OpenSource/tbc/semantic-release/#variables)).

For exemple you can modify the semantic-release tag format with the `SEMREL_TAG_FORMAT` variable (see [semantic-release template variables](https://gitlab.com/to-be-continuous/semantic-release/#variables)).



```yml

variables:

templates/gitlab-ci-maven.yml

+4 −4
Original line number Diff line number Diff line 
# =========================================================================================

# Copyright (C) 2021 Orange

# Copyright (C) 2021 Orange & contributors

#

# This program is free software; you can redistribute it and/or modify it under the terms 

# of the GNU Lesser General Public License as published by the Free Software Foundation;
@@ -14,7 +14,7 @@ 
# Floor, Boston, MA  02110-1301, USA.

# =========================================================================================

variables:

  # Maven image (can be overriden)

  # Maven image (can be overridden)

  MAVEN_IMAGE: "maven:latest"



  # default production ref name (pattern)
@@ -394,7 +394,7 @@ stages: 
  }



  function get_latest_template_version() {

    tag_json=$(curl -s --connect-timeout 5 "$CI_API_V4_URL/projects/Orange-OpenSource%2Ftbc%2F$1/repository/tags?per_page=1" 2> /dev/null || echo "")

    tag_json=$(curl -s --connect-timeout 5 "$CI_API_V4_URL/projects/to-be-continuous%2F$1/repository/tags?per_page=1" 2> /dev/null || echo "")

    echo "$tag_json" | sed -rn 's/^.*"name":"([^"]*)".*$/\1/p'

  }
@@ -435,7 +435,7 @@ stages: 
.mvn-base:

  image: $MAVEN_IMAGE

  services:

    - name: "$CI_REGISTRY/orange-opensource/tbc/tools/tracking:master"

    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"

      command: ["--service", "maven", "1.3.0" ]

  before_script:

    - *mvn-scripts