From e7da6174a457dda2a6f79fef283b42c1cbcfd562 Mon Sep 17 00:00:00 2001 From: Pablo Orviz Date: Mon, 18 Mar 2024 11:34:03 +0100 Subject: [PATCH 1/5] Add oclint --- tooling.json | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tooling.json b/tooling.json index e76ee56..162610d 100644 --- a/tooling.json +++ b/tooling.json @@ -23,6 +23,31 @@ } } }, + "Dockerfile": { + "oclint": { + "version": "20.11", + "docs": "https://oclint.org/", + "docker": { + "image": "drakorgaur/oclint:3077181575", + "reviewed": "2024-03-18" + }, + "args": [ + { + "type": "positional", "description": "File/s to lint", "value": "", "selectable": false, "repeatable": true + }, + { + "type": "positional", "description": "Compiler flags", "value": "-- -c", "selectable": false, "repeatable": true + } + ], + "reporting": { + "validator": "jenkins_exit_status", + "subcriterion": "QC.Sty01", + "lang_name": "C++", + "tool_name": "oclint", + "requirement_level": "REQUIRED" + } + } + }, "Dockerfile": { "hadolint": { "version": "v2.8.0-0-g398770f-dirty", @@ -827,6 +852,7 @@ "docs": "https://indigo-dc.github.io/sqa-baseline/#code-style-qc.sty" }, "tools": { + "C++": ["oclint"], "Dockerfile": ["hadolint"], "JSON": ["jsonlint"], "Python": ["tox", "flake8", "pycodestyle"], From dcdd6d74234f1776057f6187f5c0fc03bd4dda9a Mon Sep 17 00:00:00 2001 From: Pablo Orviz Date: Tue, 19 Mar 2024 16:22:54 +0100 Subject: [PATCH 2/5] Fix: C++ key --- tooling.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling.json b/tooling.json index 162610d..7241ac8 100644 --- a/tooling.json +++ b/tooling.json @@ -23,7 +23,7 @@ } } }, - "Dockerfile": { + "C++": { "oclint": { "version": "20.11", "docs": "https://oclint.org/", From 4900abd909d2845b04706ff0651037abd4958e25 Mon Sep 17 00:00:00 2001 From: Pablo Orviz Date: Tue, 19 Mar 2024 16:36:25 +0100 Subject: [PATCH 3/5] Enable 'explicit_paths' for oclint --- tooling.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling.json b/tooling.json index 7241ac8..eb57e72 100644 --- a/tooling.json +++ b/tooling.json @@ -33,7 +33,7 @@ }, "args": [ { - "type": "positional", "description": "File/s to lint", "value": "", "selectable": false, "repeatable": true + "type": "positional", "description": "File/s to lint", "value": "", "selectable": false, "repeatable": true, "explicit_paths": true }, { "type": "positional", "description": "Compiler flags", "value": "-- -c", "selectable": false, "repeatable": true From a3450274612e722890c81f9c011673a35b32cc71 Mon Sep 17 00:00:00 2001 From: Pablo Orviz Date: Tue, 23 Apr 2024 10:13:34 +0200 Subject: [PATCH 4/5] licensee uses ruby3 --- QC.Lic/licensee/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/QC.Lic/licensee/Dockerfile b/QC.Lic/licensee/Dockerfile index bad94b3..e23c6c7 100644 --- a/QC.Lic/licensee/Dockerfile +++ b/QC.Lic/licensee/Dockerfile @@ -1,9 +1,7 @@ -FROM ruby:2.6 +FROM ruby:3 RUN apt-get update && apt-get install -y \ cmake \ && rm -rf /var/lib/apt/lists/* WORKDIR /usr/src/app -RUN gem install octokit -v 4.25.1 -RUN gem install nokogiri -v 1.13.1 RUN gem install licensee USER 1001 From f1632fdd51fe6e8cbe3c947a6d0555d2e74c8a93 Mon Sep 17 00:00:00 2001 From: Pablo Orviz Date: Tue, 23 Apr 2024 10:14:18 +0200 Subject: [PATCH 5/5] licensee (9.17.0) relies on docker image --- tooling.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling.json b/tooling.json index eb57e72..4c4635d 100644 --- a/tooling.json +++ b/tooling.json @@ -441,10 +441,10 @@ }, "license": { "licensee": { - "version": "9.15.1", + "version": "9.17.0", "docs": "https://github.com/licensee/licensee", "docker": { - "dockerfile": "QC.Lic/licensee/Dockerfile", + "image": "eoscsynergy/sqaaas-licensee:9.17.0", "reviewed": "2021-06-28" }, "args": [