Commit 371427ac authored by Ruben ten Hove's avatar Ruben ten Hove
Browse files

fix: tbump extends overwrite

parent 2885f644

pipelines/container.md

+6 −4
Original line number Diff line number Diff line 
# Container CI templates



## Monorepo (multiple Dockerfiles)



You can build multiple `Dockerfile`s in your repository, by using the following

steps. We differentiate between a primary image and secondary and further

steps. We differentiate between a primary image, and secondary and further

images. The primary image will be used by any subsequent jobs that rely on a

built container to perform further actions. For example, the job `python:pytest`

will be using this primary container.

built image to perform further actions. For example, the job `python:pytest`

will be using this primary image.



This container is built by the job `image:build`, which is the default job for

This image is built by the job `image:build`, which is the default job for

building any image when importing our templates.



We provide two examples with a directory tree and a `.gitlab-ci.yml`.

pipelines/project-automation.yml

+3 −1
Original line number Diff line number Diff line
@@ -8,5 +8,7 @@ include: 
  - local: python/tbump.yml



tbump:

  extends: .release:rules

  extends:

    - .python:pre

    - .release:rules

  needs: [find-next-release]

project-automation/semantic-release-badge.yml

+1 −2
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.

  before_script:

    # If tbump did not create a new version, get the tag of the current commit

    - TAG_VERSION="${TBUMP_NEXT_VERSION:-$(git describe --tags --abbrev=0)}"

    - |

      if [ "${TAG_VERSION}" = "" ]; then

        echo "[!] No bumped version."

        exit 0

      elif [ ! "${TAG_VERSION::1}" = "v" ]; then

        TAG_VERSION="v${TAG_VERSION}"

      fi

project-automation/semantic-release.yml

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ include: 


variables:

  RELEASE_CHANGELOG: "true"

  DISABLE_AUTO_FIX_ASSETS: "false"



semantic-release:

  extends: .release:rules
@@ -13,7 +14,6 @@ semantic-release: 
  stage: .post

  variables:

    EXTRA_ARGS: ""

    DISABLE_AUTO_FIX_ASSETS: "false"

    DEFAULT_RELEASERC: https://gitlab.com/just-ci/utils/-/raw/v1.1.0/semantic-release/gitlab-default.json

    NPM_PACKAGES:

      semantic-release @semantic-release/gitlab @semantic-release/git