Commit c1933718 authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

Merge branch 'beta' of gitlab.com:just-ci/templates into rhtenhove-beta-patch-01383

parents bca17322 e89dbcfc

.gitlab-ci.yml

+0 −11
Original line number Diff line number Diff line
@@ -15,17 +15,6 @@ gitlab:recommended: 
  variables:

    GITLAB_RECOMMENDED_AUTO_FIX: "true"



badge:test:

  extends: .badge

  stage: test

  variables:

    NAME: "branch"

    VALUE: "${CI_COMMIT_REF_NAME}"

    COLOR: "fuchsia"

  rules:

    - if: $GL_TOKEN

      when: never

    - when: always



pages:

  stage: test

README.md

+3 −3
Original line number Diff line number Diff line 
# Just CI templates v4.1.0

# Just CI templates v4.1.1



Maintainers:

* Federico Falconieri: @falcorocks
@@ -42,7 +42,7 @@ Here is an example `.gitlab-ci.yml` importing the python template: 
include:

  - project: 'just-ci/templates'

    file: 'templates/python.yml'

    ref: 'v4.1.0'

    ref: 'v4.1.1'

```



The above is a template for Python projects. Other templates can be found in `templates/`, for example:
@@ -59,7 +59,7 @@ Templates and pipelines may come with jobs you don't want/need to run. We have c 
include:

  - project: 'just-ci/templates'

    file: 'templates/python.yml'

    ref: 'v4.1.0'

    ref: 'v4.1.1'



python:pytest:

  rules:

pipelines/project-automation.yml

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ include: 
  - local: "project-automation/find-next-release.yml"

  - local: "project-automation/gitlab-recommended.yml"

  - local: "project-automation/semantic-release.yml"

  - local: "project-automation/badge.yml"

  - local: "project-automation/check-GL-token.yml"

  - local: "python/tbump.yml"

project-automation/badge.yml

+0 −14
Original line number Diff line number Diff line
@@ -67,17 +67,3 @@ 
  allow_failure: true

  rules:

    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 


badge:semantic-release:

  extends: .badge

  before_script:  # We can't do this in rules as this variable is created during the pipeline run.

    - |

      if [ -z "${TBUMP_NEXT_VERSION}" ]; then

        echo "[!] No next version."

        exit 0

      fi

  variables:

    NAME: "version"

    VALUE: "v${TBUMP_NEXT_VERSION}"

    COLOR: "green"

    URL: "${CI_PROJECT_URL}/tags/v${TBUMP_NEXT_VERSION}"

project-automation/semantic-release-badge.yml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
---

badge:semantic-release:

  extends: .badge

  before_script:  # We can't do this in rules as this variable is created during the pipeline run.

    - |

      if [ -z "${TBUMP_NEXT_VERSION}" ]; then

        echo "[!] No next version."

        exit 0

      fi

  variables:

    NAME: "version"

    VALUE: "v${TBUMP_NEXT_VERSION}"

    COLOR: "green"

    URL: "${CI_PROJECT_URL}/tags/v${TBUMP_NEXT_VERSION}"