From 4665f529aadc720632bd54e5984660e30114c61b Mon Sep 17 00:00:00 2001 From: Can Eldem Date: Tue, 10 Dec 2019 13:19:23 +0000 Subject: [PATCH 1/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aedc47ad245..403b060d3bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -185,6 +185,6 @@ include: license_management: before_script: - sudo apt-get update - - sudo apt-get install -y libicu-dev libgit2-dev cmake + - sudo apt-get install -y libicu-dev libgit2-dev libicu-dev cmake variables: LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby' -- GitLab From 7a7ac2462109a868fa1000f5eb9a1ddc4558eaf4 Mon Sep 17 00:00:00 2001 From: Can Eldem Date: Wed, 11 Dec 2019 10:24:44 +0000 Subject: [PATCH 2/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 403b060d3bb..41ecda22a38 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,6 +183,7 @@ include: template: Security/License-Management.gitlab-ci.yml license_management: + image: "registry.gitlab.com/gitlab-org/security-products/license-management/tmp:a4bd4a2f2ea4ae3a73633b08adf0c042353ec24c" before_script: - sudo apt-get update - sudo apt-get install -y libicu-dev libgit2-dev libicu-dev cmake -- GitLab From 3bf4935ed07e82adc39a605b9c51f01ae603ecf8 Mon Sep 17 00:00:00 2001 From: Can Eldem Date: Wed, 11 Dec 2019 10:41:37 +0000 Subject: [PATCH 3/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41ecda22a38..1a9a1bb8cd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -189,3 +189,7 @@ license_management: - sudo apt-get install -y libicu-dev libgit2-dev libicu-dev cmake variables: LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby' + artifacts: + reports: + license_management: gl-license-management-report.json + -- GitLab From f22f0d963ef0da91cf1d42a29d0c6a75108e8418 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 12 Dec 2019 00:48:32 +0000 Subject: [PATCH 4/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1a9a1bb8cd3..148b3241139 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,10 +186,6 @@ license_management: image: "registry.gitlab.com/gitlab-org/security-products/license-management/tmp:a4bd4a2f2ea4ae3a73633b08adf0c042353ec24c" before_script: - sudo apt-get update - - sudo apt-get install -y libicu-dev libgit2-dev libicu-dev cmake + - sudo apt-get install -y libicu-dev libgit2-dev cmake variables: - LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby' - artifacts: - reports: - license_management: gl-license-management-report.json - + LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby' \ No newline at end of file -- GitLab From 1f07d9b0c4b2651d8d8d234663bed82baab7a047 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 12 Dec 2019 00:50:51 +0000 Subject: [PATCH 5/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 148b3241139..bb63295bb3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,4 +188,5 @@ license_management: - sudo apt-get update - sudo apt-get install -y libicu-dev libgit2-dev cmake variables: + LM_REPORT_VERSION: '2.0' LICENSE_FINDER_CLI_OPTS: '--aggregate-paths=. ruby' \ No newline at end of file -- GitLab