diff --git a/CHANGELOG.md b/CHANGELOG.md index db0556a11a5ff44c7fc5e78cd7932bc11833d805..3656e2a1fabf445de950165de0778d1a5a6923ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.11.1](https://gitlab.com/to-be-continuous/python/compare/6.11.0...6.11.1) (2024-05-05) + + +### Bug Fixes + +* **workflow:** disable MR pipeline from prod & integ branches ([8703dea](https://gitlab.com/to-be-continuous/python/commit/8703dea915ca48038588adcc2a0672269dd24bb4)) + # [6.11.0](https://gitlab.com/to-be-continuous/python/compare/6.10.0...6.11.0) (2024-04-28) diff --git a/README.md b/README.md index cd89555b8ac74d6c2e7be950c06fac1cf9199463..7614c45e4b80a626dc015ae0aed90d1dd82f056b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Add the following to your `gitlab-ci.yml`: ```yaml include: # 1: include the component - - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.11.0 + - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.11.1 # 2: set/override component inputs inputs: image: registry.hub.docker.com/library/python:3.10 @@ -29,7 +29,7 @@ Add the following to your `gitlab-ci.yml`: include: # 1: include the template - project: 'to-be-continuous/python' - ref: '6.11.0' + ref: '6.11.1' file: '/templates/gitlab-ci-python.yml' variables: @@ -516,9 +516,9 @@ With: ```yaml include: # main component - - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.11.0 + - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.11.1 # Vault variant - - component: gitlab.com/to-be-continuous/python/gitlab-ci-python-vault@6.11.0 + - component: gitlab.com/to-be-continuous/python/gitlab-ci-python-vault@6.11.1 inputs: vault-base-url: "https://vault.acme.host/v1" # audience claim for JWT @@ -558,13 +558,13 @@ The variant requires the additional configuration parameters: ```yaml include: - - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.11.0 + - component: gitlab.com/to-be-continuous/python/gitlab-ci-python@6.11.1 # 2: set/override component inputs inputs: image: registry.hub.docker.com/library/python:3.10 pytest-enabled: true - - component: gitlab.com/to-be-continuous/python/gitlab-ci-python-gcp@6.11.0 + - component: gitlab.com/to-be-continuous/python/gitlab-ci-python-gcp@6.11.1 inputs: # common OIDC config for non-prod envs gcp-oidc-provider: "projects/<gcp_nonprod_proj_id>/locations/global/workloadIdentityPools/<pool_id>/providers/<provider_id>" diff --git a/templates/gitlab-ci-python-gcp.yml b/templates/gitlab-ci-python-gcp.yml index 5394e0c4774a8b475eceee7b35d0384b6b11e976..eb8a53ac98506b5c5f09b0d662985318e24b6555 100644 --- a/templates/gitlab-ci-python-gcp.yml +++ b/templates/gitlab-ci-python-gcp.yml @@ -44,7 +44,7 @@ variables: image: $PYTHON_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "python", "6.11.0"] + command: ["--service", "python", "6.11.1"] variables: GCP_JWT: $GCP_JWT before_script: diff --git a/templates/gitlab-ci-python-vault.yml b/templates/gitlab-ci-python-vault.yml index cf2be784d858e72f9c80103f58e180bb23d94e84..7e541c83ef7c09b5d6d1adf40677c76c9fc97421 100644 --- a/templates/gitlab-ci-python-vault.yml +++ b/templates/gitlab-ci-python-vault.yml @@ -22,7 +22,7 @@ variables: .python-base: services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "python", "6.11.0"] + command: ["--service", "python", "6.11.1"] - name: "$TBC_VAULT_IMAGE" alias: "vault-secrets-provider" variables: diff --git a/templates/gitlab-ci-python.yml b/templates/gitlab-ci-python.yml index 721abbb2d1cabf8b09f2097e90befaaf37ffef6e..04914720e087538cf42069bd296c732b63bed339 100644 --- a/templates/gitlab-ci-python.yml +++ b/templates/gitlab-ci-python.yml @@ -826,7 +826,7 @@ stages: image: $PYTHON_IMAGE services: - name: "$TBC_TRACKING_IMAGE" - command: ["--service", "python", "6.11.0"] + command: ["--service", "python", "6.11.1"] variables: # set local cache dir; most Python tools honour XDG specs XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"