diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-05-28 09:04:00 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-05-28 09:04:00 +0000 |
| commit | 0b976fcffe0a9b8e80587adb076bcdf279c9331c (patch) | |
| tree | 5b33f9242f67164bb221797ca3d331412bf8ed4d /.gitlab | |
| parent | 5b4aca6e3c936bca2657d1ad1a8f336838fda4bb (diff) | |
| parent | aec641a6175997b1779c7e41513f9c893dcd4afb (diff) | |
Merge branch '212919-conan-tests' into 'master'
Add tests for Conan projects.
See merge request gitlab-org/security-products/license-management!158
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/test.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab/test.yml b/.gitlab/test.yml index 4d1f77e..2399911 100644 --- a/.gitlab/test.yml +++ b/.gitlab/test.yml @@ -96,6 +96,10 @@ integration-ruby: rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH +functional-c-conan: + extends: .functional + trigger: gitlab-org/security-products/tests/c-conan + functional-csharp-nuget-dotnetcore: extends: .functional trigger: gitlab-org/security-products/tests/csharp-nuget-dotnetcore |