Skip to content
Snippets Groups Projects
Commit eff5a0da authored by Benguria Elguezabal, Gorka's avatar Benguria Elguezabal, Gorka
Browse files

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	CHANGELOG.md
parents f43cf250 c72fe3b9
No related branches found
No related tags found
No related merge requests found
Pipeline #169998 passed
......@@ -20,7 +20,7 @@ Add the following to your `.gitlab-ci.yml`:
```yaml
include:
# 1: include the component
- component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.11.5
- component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.12.0
# 2: set/override component inputs
inputs:
changelog-enabled: true # ⚠ this is only an example
......@@ -34,7 +34,7 @@ Add the following to your `.gitlab-ci.yml`:
include:
# 1: include the template
- project: 'to-be-continuous/semantic-release'
ref: '3.11.5'
ref: '3.12.0'
file: '/templates/gitlab-ci-semrel.yml'
variables:
......@@ -382,9 +382,9 @@ With:
```yaml
include:
# main template
- component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.11.5
- component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel@3.12.0
# Vault variant
- component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel-vault@3.11.5
- component: $CI_SERVER_FQDN/to-be-continuous/semantic-release/gitlab-ci-semrel-vault@3.12.0
inputs:
vault-base-url: "https://vault.acme.host/v1"
# audience claim for JWT
......
......@@ -22,7 +22,7 @@ variables:
.semrel-base:
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "semrel", "3.11.5"]
command: ["--service", "semrel", "3.12.0"]
- name: "$TBC_VAULT_IMAGE"
alias: "vault-secrets-provider"
variables:
......
......@@ -117,9 +117,6 @@ workflow:
- when: always
variables:
# variabilized tracking image
TBC_TRACKING_IMAGE: registry.gitlab.com/to-be-continuous/tools/tracking:master
# Default Docker image (use a public image - can be overridden)
SEMREL_IMAGE: $[[ inputs.image ]]
SEMREL_HOOKS_DIR: $[[ inputs.hooks-dir ]]
......@@ -803,7 +800,7 @@ stages:
image: $SEMREL_IMAGE
services:
- name: "$TBC_TRACKING_IMAGE"
command: ["--service", "semrel", "3.11.5"]
command: ["--service", "semrel", "3.12.0"]
before_script:
- !reference [.semrel-scripts]
- install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment