Verified Commit 89aca401 authored by Andrew Newdigate's avatar Andrew Newdigate Committed by GitLab
Browse files

Merge branch 'renovate/common-ci-tasks' into 'master' 

chore(deps): update pre-commit hook gitlab-com/gl-infra/common-ci-tasks to v4.18

See merge request !318

Merged-by: Andrew Newdigate's avatarAndrew Newdigate <andrew@gitlab.com>
Approved-by: Andrew Newdigate's avatarAndrew Newdigate <andrew@gitlab.com>
Co-authored-by: default avatarGitLab Renovate Bot <ops-contact+gl-common-ci-tasks-self-renovate@gitlab.com>
parents 937d0e20 4f5c1b8c

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ include: 
  # It includes standard checks, gitlab-scanners, validations and release processes

  # common to all projects using this template library.

  # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/standard.md

  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v4.17

  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/standard-build@v4.18



  # Runs rspec tests and rubocop on the project

  # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/templates/ruby.md

  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v4.17

  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/ruby-build@v4.18



  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v4.17

  - component: $CI_SERVER_FQDN/gitlab-com/gl-infra/common-ci-tasks/danger@v4.18



# Attach a redis service to the rspec job from common-ci-tasks/ruby-build.

# GitLab merges keys when a local job has the same name as an included one,

.pre-commit-config.yaml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ repos: 
  # Documentation available at

  # https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/docs/pre-commit.md

  - repo: https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks

    rev: v4.17  # renovate:managed

    rev: v4.18  # renovate:managed



    hooks:

      - id: shellcheck  # Run shellcheck for changed Shell files