Commit ff738dca authored by semantic-release-bot's avatar semantic-release-bot
Browse files
parent 92c02e6d
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ In order to include this template in your project, add the following to your `gi
```yaml
include:
  - project: 'to-be-continuous/s3'
    ref: '1.1.0'
    ref: '1.2.0'
    file: '/templates/gitlab-ci-s3.yml'
```

@@ -248,11 +248,11 @@ With:
include:
  # main template
  - project: 'to-be-continuous/s3'
    ref: '1.1.0'
    ref: '1.2.0'
    file: '/templates/gitlab-ci-s3.yml'
  # Vault variant
  - project: 'to-be-continuous/s3'
    ref: '1.1.0'
    ref: '1.2.0'
    file: '/templates/gitlab-ci-s3-vault.yml'

variables:
+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ variables:
.s3-base:
  services:
    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
      command: ["--service", "s3", "1.1.0" ]
      command: ["--service", "s3", "1.2.0" ]
    - name: "$CI_REGISTRY/to-be-continuous/tools/vault-secrets-provider:master"
      alias: "vault-secrets-provider"
+2 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ stages:
    fi
  }

  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update s3 "1.1.0"; fi
  if [[ -z "$TEMPLATE_CHECK_UPDATE_DISABLED" ]]; then check_for_update s3 "1.2.0"; fi
  unscope_variables
  eval_all_secrets

@@ -404,7 +404,7 @@ stages:
    entrypoint: [""]
  services:
    - name: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"
      command: ["--service", "s3", "1.1.0" ]
      command: ["--service", "s3", "1.2.0" ]
  before_script:
    - *s3-scripts
    - install_ca_certs "${CUSTOM_CA_CERTS:-$DEFAULT_CA_CERTS}"