diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9cb8c368661af68be260f0ea3e3b4188c6e5b0a..5a5b03a862a50e0518064475ed22c5026f815bb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,15 @@ include: - - project: 'to-be-continuous/tools/gitlab-ci' - ref: 'master' - file: '/templates/extract.yml' - - project: 'to-be-continuous/tools/gitlab-ci' - ref: 'master' - file: '/templates/validation.yml' - - project: 'to-be-continuous/kicker' - ref: 'master' - file: '/templates/validation.yml' - - local: 'templates/gitlab-ci-bash.yml' - - project: 'to-be-continuous/semantic-release' - ref: '3.11' - file: '/templates/gitlab-ci-semrel.yml' - -stages: - - build - - publish + - project: "to-be-continuous/tools/gitlab-ci" + ref: "master" + file: "/templates/extract.yml" + - project: "to-be-continuous/tools/gitlab-ci" + ref: "master" + file: "/templates/validation.yml" + - project: "to-be-continuous/kicker" + ref: "master" + file: "/templates/validation.yml" + - local: "templates/gitlab-ci-bash.yml" + - component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.11 variables: GITLAB_CI_FILES: "templates/gitlab-ci-bash.yml" diff --git a/README.md b/README.md index bd5785bc8431dce8db7d93ac35133c2386e288e6..21b30af7863f67fdf14b91eb8028640392925937 100644 --- a/README.md +++ b/README.md @@ -4,17 +4,17 @@ This project implements a GitLab CI/CD template to test and analyse your shell c ## Usage -This template can be used both as a [CI/CD component](https://docs.gitlab.com/ee/ci/components/#use-a-component-in-a-cicd-configuration) +This template can be used both as a [CI/CD component](https://docs.gitlab.com/ee/ci/components/#use-a-component) or using the legacy [`include:project`](https://docs.gitlab.com/ee/ci/yaml/index.html#includeproject) syntax. ### Use as a CI/CD component -Add the following to your `gitlab-ci.yml`: +Add the following to your `.gitlab-ci.yml`: ```yaml include: # 1: include the component - - component: gitlab.com/to-be-continuous/bash/gitlab-ci-bash@3.4.1 + - component: $CI_SERVER_FQDN/to-be-continuous/bash/gitlab-ci-bash@3.4.1 # 2: set/override component inputs inputs: bats-enabled: true # ⚠ this is only an example @@ -22,7 +22,7 @@ include: ### Use as a CI/CD template (legacy) -Add the following to your `gitlab-ci.yml`: +Add the following to your `.gitlab-ci.yml`: ```yaml include: