From be30908119f19a7c7eb3e004a7fc79d3e121a996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tadeusz=20Miesi=C4=85c?= <tadeusz.miesiac@gmail.com>
Date: Tue, 19 Sep 2023 15:04:53 +0200
Subject: [PATCH] fix(ci): ci
---
.gitlab-ci.yml | 21 ++++++++++++---
coverage/clover.xml | 12 ++++-----
coverage/coverage-final.json | 2 +-
.../ExampleDomain.component.tsx.html | 26 +++++--------------
coverage/lcov-report/index.html | 18 ++++++-------
coverage/lcov.info | 16 ++++--------
package.json | 1 +
7 files changed, 45 insertions(+), 51 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c8b8d60e..cb08bb82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-default:
- image: node:16.16.0
-
stages:
- test
cache:
@@ -8,6 +5,7 @@ cache:
- ~/.cache
jest:
+ image: node:16.16.0
stage: test
before_script:
- apk add --no-cache npm
@@ -15,7 +13,22 @@ jest:
script:
- npm run test:ci
only:
- - master
+ - development
+ - merge_requests
+ - tags
+ tags:
+ - k8s
+
+linter:
+ image: node:16.16.0
+ stage: test
+ before_script:
+ - apk add --no-cache npm
+ - npm ci
+ script:
+ - npm run lint:ts
+ only:
+ - development
- merge_requests
- tags
tags:
diff --git a/coverage/clover.xml b/coverage/clover.xml
index 2a9713ec..8b0855b6 100644
--- a/coverage/clover.xml
+++ b/coverage/clover.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1695070376179" clover="3.2.0">
- <project timestamp="1695070376180" name="All files">
- <metrics statements="4" coveredstatements="4" conditionals="0" coveredconditionals="0" methods="2" coveredmethods="1" elements="6" coveredelements="5" complexity="0" loc="4" ncloc="4" packages="1" files="1" classes="1"/>
+<coverage generated="1695128305612" clover="3.2.0">
+ <project timestamp="1695128305612" name="All files">
+ <metrics statements="2" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0" elements="2" coveredelements="2" complexity="0" loc="2" ncloc="2" packages="1" files="1" classes="1"/>
<file name="ExampleDomain.component.tsx" path="/Users/Tadeusz/Documents/GitHub/minerva-frontend/src/components/[DomainName]/ExampleDomain.component.tsx">
- <metrics statements="4" coveredstatements="4" conditionals="0" coveredconditionals="0" methods="2" coveredmethods="1"/>
+ <metrics statements="2" coveredstatements="2" conditionals="0" coveredconditionals="0" methods="0" coveredmethods="0"/>
<line num="1" count="1" type="stmt"/>
- <line num="3" count="1" type="stmt"/>
- <line num="4" count="1" type="stmt"/>
- <line num="9" count="1" type="stmt"/>
+ <line num="5" count="1" type="stmt"/>
</file>
</project>
</coverage>
diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
index 14a7cb92..9082e31d 100644
--- a/coverage/coverage-final.json
+++ b/coverage/coverage-final.json
@@ -1,2 +1,2 @@
-{"/Users/Tadeusz/Documents/GitHub/minerva-frontend/src/components/[DomainName]/ExampleDomain.component.tsx": {"path":"/Users/Tadeusz/Documents/GitHub/minerva-frontend/src/components/[DomainName]/ExampleDomain.component.tsx","statementMap":{"0":{"start":{"line":9,"column":0},"end":{"line":9,"column":15}},"1":{"start":{"line":1,"column":18},"end":{"line":1,"column":null}},"2":{"start":{"line":3,"column":22},"end":{"line":7,"column":null}},"3":{"start":{"line":4,"column":15},"end":{"line":4,"column":null}},"4":{"start":{"line":9,"column":15},"end":{"line":9,"column":null}}},"fnMap":{"0":{"name":"(anonymous_2)","decl":{"start":{"line":3,"column":22},"end":{"line":3,"column":null}},"loc":{"start":{"line":3,"column":22},"end":{"line":7,"column":null}}},"1":{"name":"(anonymous_3)","decl":{"start":{"line":4,"column":15},"end":{"line":4,"column":28}},"loc":{"start":{"line":4,"column":15},"end":{"line":4,"column":null}}}},"branchMap":{},"s":{"0":1,"1":1,"2":1,"3":1,"4":1},"f":{"0":1,"1":0},"b":{}}
+{"/Users/Tadeusz/Documents/GitHub/minerva-frontend/src/components/[DomainName]/ExampleDomain.component.tsx": {"path":"/Users/Tadeusz/Documents/GitHub/minerva-frontend/src/components/[DomainName]/ExampleDomain.component.tsx","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":5,"column":15}},"1":{"start":{"line":1,"column":18},"end":{"line":1,"column":null}},"2":{"start":{"line":5,"column":15},"end":{"line":5,"column":null}}},"fnMap":{},"branchMap":{},"s":{"0":1,"1":1,"2":1},"f":{},"b":{}}
}
diff --git a/coverage/lcov-report/ExampleDomain.component.tsx.html b/coverage/lcov-report/ExampleDomain.component.tsx.html
index 77de184c..0c8f263b 100644
--- a/coverage/lcov-report/ExampleDomain.component.tsx.html
+++ b/coverage/lcov-report/ExampleDomain.component.tsx.html
@@ -25,7 +25,7 @@
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Statements</span>
- <span class='fraction'>5/5</span>
+ <span class='fraction'>3/3</span>
</div>
@@ -37,16 +37,16 @@
<div class='fl pad1y space-right2'>
- <span class="strong">50% </span>
+ <span class="strong">100% </span>
<span class="quiet">Functions</span>
- <span class='fraction'>1/2</span>
+ <span class='fraction'>0/0</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Lines</span>
- <span class='fraction'>4/4</span>
+ <span class='fraction'>2/2</span>
</div>
@@ -68,26 +68,14 @@
<a name='L3'></a><a href='#L3'>3</a>
<a name='L4'></a><a href='#L4'>4</a>
<a name='L5'></a><a href='#L5'>5</a>
-<a name='L6'></a><a href='#L6'>6</a>
-<a name='L7'></a><a href='#L7'>7</a>
-<a name='L8'></a><a href='#L8'>8</a>
-<a name='L9'></a><a href='#L9'>9</a>
-<a name='L10'></a><a href='#L10'>10</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral"> </span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral"> </span>
+<a name='L6'></a><a href='#L6'>6</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-neutral"> </span>
<span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-neutral"> </span></td><td class="text"><pre class="prettyprint lang-js">import React from 'react';
-const ExampleDomain = (): JSX.Element => {
- const test = <span class="fstat-no" title="function not covered" >(): void => {}</span>;
-
- return <p>test</p>;
-};
+const ExampleDomain = (): JSX.Element => <p>test</p>;
export default ExampleDomain;
</pre></td></tr></table></pre>
@@ -97,7 +85,7 @@ export default ExampleDomain;
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
- at 2023-09-18T20:52:56.190Z
+ at 2023-09-19T12:58:25.625Z
</div>
<script src="prettify.js"></script>
<script>
diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
index d48e0844..81ba773e 100644
--- a/coverage/lcov-report/index.html
+++ b/coverage/lcov-report/index.html
@@ -25,7 +25,7 @@
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Statements</span>
- <span class='fraction'>5/5</span>
+ <span class='fraction'>3/3</span>
</div>
@@ -37,16 +37,16 @@
<div class='fl pad1y space-right2'>
- <span class="strong">50% </span>
+ <span class="strong">100% </span>
<span class="quiet">Functions</span>
- <span class='fraction'>1/2</span>
+ <span class='fraction'>0/0</span>
</div>
<div class='fl pad1y space-right2'>
<span class="strong">100% </span>
<span class="quiet">Lines</span>
- <span class='fraction'>4/4</span>
+ <span class='fraction'>2/2</span>
</div>
@@ -84,13 +84,13 @@
<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
</td>
<td data-value="100" class="pct high">100%</td>
- <td data-value="5" class="abs high">5/5</td>
+ <td data-value="3" class="abs high">3/3</td>
+ <td data-value="100" class="pct high">100%</td>
+ <td data-value="0" class="abs high">0/0</td>
<td data-value="100" class="pct high">100%</td>
<td data-value="0" class="abs high">0/0</td>
- <td data-value="50" class="pct medium">50%</td>
- <td data-value="2" class="abs medium">1/2</td>
<td data-value="100" class="pct high">100%</td>
- <td data-value="4" class="abs high">4/4</td>
+ <td data-value="2" class="abs high">2/2</td>
</tr>
</tbody>
@@ -101,7 +101,7 @@
<div class='footer quiet pad2 space-top1 center small'>
Code coverage generated by
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
- at 2023-09-18T20:52:56.190Z
+ at 2023-09-19T12:58:25.625Z
</div>
<script src="prettify.js"></script>
<script>
diff --git a/coverage/lcov.info b/coverage/lcov.info
index 25719e0d..8b6abf1c 100644
--- a/coverage/lcov.info
+++ b/coverage/lcov.info
@@ -1,17 +1,11 @@
TN:
SF:src/components/[DomainName]/ExampleDomain.component.tsx
-FN:3,(anonymous_2)
-FN:4,(anonymous_3)
-FNF:2
-FNH:1
-FNDA:1,(anonymous_2)
-FNDA:0,(anonymous_3)
+FNF:0
+FNH:0
DA:1,1
-DA:3,1
-DA:4,1
-DA:9,1
-LF:4
-LH:4
+DA:5,1
+LF:2
+LH:2
BRF:0
BRH:0
end_of_record
diff --git a/package.json b/package.json
index c2b5e41e..0c847977 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"build": "next build",
"start": "next start",
"lint": "next lint",
+ "lint:ts": "node_modules/eslint/bin/eslint.js src --ext .ts,.tsx",
"prepare": "husky install",
"postinstall": "husky install",
"test": "jest --watch --config ./jest.config.mjs",
--
GitLab