Commit 8691c13a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'add-conan-lock-file-to-gemnasium-job' into 'master'

Add Dependency Scanning support for Conan lock files

See merge request gitlab-org/gitlab!39811
parents 9ba40bc4 137b97f0
---
title: Add Conan lock file support to Dependency Scanning
merge_request: 39811
author:
type: added
......@@ -68,6 +68,7 @@ RSpec.describe 'Dependency-Scanning.gitlab-ci.yml' do
'Javascript npm-shrinkwrap.json' | { 'npm-shrinkwrap.json' => '' } | %w(gemnasium-dependency_scanning)
'Multiple languages' | { 'pom.xml' => '', 'package.json' => '' } | %w(gemnasium-maven-dependency_scanning retire-js-dependency_scanning)
'NuGet' | { 'packages.lock.json' => '' } | %w(gemnasium-dependency_scanning)
'Conan' | { 'conan.lock' => '' } | %w(gemnasium-dependency_scanning)
'PHP' | { 'composer.lock' => '' } | %w(gemnasium-dependency_scanning)
'Python requirements.txt' | { 'requirements.txt' => '' } | %w(gemnasium-python-dependency_scanning)
'Python requirements.pip' | { 'requirements.pip' => '' } | %w(gemnasium-python-dependency_scanning)
......
......@@ -114,6 +114,7 @@ gemnasium-dependency_scanning:
- '{package-lock.json,*/package-lock.json,*/*/package-lock.json}'
- '{yarn.lock,*/yarn.lock,*/*/yarn.lock}'
- '{packages.lock.json,*/packages.lock.json,*/*/packages.lock.json}'
- '{conan.lock,*/conan.lock,*/*/conan.lock}'
gemnasium-maven-dependency_scanning:
extends: .ds-analyzer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment